Fay.Liang
c9e484c311
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into int_15.1.1
...
Former-commit-id: f2b3a2fc2c1a5362673fed5b4841cd6d5d86ea5d
2015-05-29 15:43:59 -04:00
Sean.Webb
90bb72d49d
ASM #17513 - Added PWSAT pattern
...
Change-Id: I6658dfed7460b38d826cc6ee6fc4600c1dd35cf4
Former-commit-id: 2b940dcfc16c445c055696ff08177196f708f935
2015-05-28 17:11:41 -04:00
Ana Rivera
d5da5dfff6
Merge branch 'master_15.1.1'(master_15.1.1-12) into field_15.1.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/aviation.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I9c737b735af5d1066448c71e1ffc09a1129f7435
Former-commit-id: 1f5ab00d137a3e5e75a20b15a65c4b34596a9b38
2015-05-21 13:39:59 +00:00
Shawn.Hooper
003c528458
ASM #17024 - Merge up to 14.4.1-38 into 15.1.1-10
...
Change-Id: Id4091550082328ce8a682db5ddd1a133fb7a5d39
Former-commit-id: 721a43ed8a1c9fdd1e5c62827869a91a20bfb416
2015-05-12 11:30:23 -04:00
Fay.Liang
a07bb535be
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 02ea64b8c62525e9ec63bce9ad0d573fa4f6d6c0
2015-05-12 10:06:11 -04:00
Ana Rivera
12f8c4cf81
Merge branch 'master_14.4.1'(OB_14.4.1-36) into field_15.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I33c3dd2cc2b8be8a8ca9370839f07512b12d8e6d
Former-commit-id: 8608cf4250be497aa20d13088a20bece02befd92
2015-05-11 20:21:13 +00:00
Kevin.Johnson
1e4e452389
ASM #17480 - added HFR pattern to pqact.conf.template
...
Change-Id: I01c4a9bc038e41aadcf81b6e7ec9667d214a702f
Former-commit-id: 65dfaecbbe9bc276fbe77d6646e89085311c3dae
2015-05-11 12:57:51 -04:00
Steve Harris
2cc7b15af1
Merge tag 'OB_14.4.1-36' into omaha_14.4.1
...
14.4.1-36
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 8256d399c695b9ebcd8966d34fbc7f938505b574
2015-05-08 13:01:38 -05:00
Slav Korolev
2a1cad119b
Omaha #4434 - Added pattern for GFS20
...
Former-commit-id: 87849fbc952fb4b5ae58c43b00c118e1ab100c61
2015-05-07 11:55:17 -04:00
Sean.Webb
933c8172e7
ASM #17468 - Commented out MRMS pattern
...
Change-Id: I43c9d5df9cc30f6bf9ec2a3929999cb3cb4c12f7
Former-commit-id: c341f3ef9f3ffc4fd313966ff4e85a19e9ca55b3
2015-05-06 11:00:06 -04:00
Shawn Hooper
4a66af9dac
Revert "ASM #17467 - Commented out MRMS entry"
...
This reverts commit 3b5a5bc44e
2015-05-06 11:01:18 -05:00
Sean.Webb
3b5a5bc44e
ASM #17467 - Commented out MRMS entry
...
Change-Id: I8c9ffd223be82c3db4d9bad55cb1d5c93ffa6c68
Former-commit-id: e09eb0800c7798bc81dc8e5f617a7460cba1cae8
2015-05-06 10:47:11 -04:00
Shawn.Hooper
48e06c41ad
ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33
...
Merge 14.4.1-33 into 15.1.1-8
Change-Id: Iaebe94615f952be4b294aea0bcba04117b903e9c
Former-commit-id: 1f63e395c67afa5106bde7b96b72d4b3111221d3
2015-05-01 16:12:48 -04:00
Brian Graham
8f043395fa
ASM #14516 - Fixed bracket typo for edex component.spec
...
Change-Id: I8f820785014b18e124050ef10f96a4e2854582b2
Former-commit-id: 401b73b680cfac4b870f798d742e0ad8dcfb53c7
2015-04-27 12:43:06 -04:00
Shawn.Hooper
bfeceac493
Merge branch 'master_14.4.1' into asm_14.4.1
...
Merge up to 14.4.1-28
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I94021611ed076207a6632895925f20cc0edd4888
Former-commit-id: 12eaf1024c288cfbe746d70336f13268587848ad
2015-04-24 16:27:06 -04:00
Shawn.Hooper
c03499c025
Merge branch 'master_15.1.1' into asm_15.1.1
...
Merges up to 15.1.1-7 back into the asm_15.1.1 branch.
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Change-Id: Ica098ffb233837e4fcb718e9c75a78de443eb267
Former-commit-id: 78b3f7a15c5d2ab60235f40f5236bbbbe58d28ce
2015-04-24 15:44:14 -04:00
Sean.Webb
18ceef2aad
ASM #17414 - EKDMOS pqact pattern changes
...
Change-Id: Ic2ac59f79fd53ef244ab0a40cfb30c40ceb575c3
Former-commit-id: 262fd6e27cb512137a2576e58d9813ca90b1e90b
2015-04-24 14:17:41 -04:00
Shawn.Hooper
9325548441
ASM #17024 - Update awips2-yajsw rpm name to include AWIPS2 release and build number
...
Change-Id: I6135fb14ebdeda3f47878e386b188442794588ec
Former-commit-id: 401f5f5c7d0c46e97abd1d69fd0652fbe2ff8d8f
2015-04-23 12:02:07 -04:00
Shawn.Hooper
57986e84d2
ASM #17024 - Update Java build script to include AWIPS2 release and build number in the rpm name
...
Change-Id: I153f4787a67d07f2971f3ca007b94b798f4179b3
Former-commit-id: 44e26917444531b5587ddb528819d54d7d8fe09c
2015-04-23 11:37:44 -04:00
Fay.Liang
8d05dd54f9
Merge tag 'OB_14.3.3-6' into master_14.4.1
...
14.3.3-6
Former-commit-id: 60bbc49613d1ea355e49061fb984db9de257b0a5
2015-04-21 10:09:11 -04:00
Shawn.Hooper
254daaed4c
ASM #17024 - Remove spec files from AWIPS2_baseline repo since they are now in the AWIPS2_build repo
...
Change-Id: I14b65414257dad225cb8393b23494f4ff21f5223
Former-commit-id: 6abf46819e7b592b34d7f48c9476653b7cfc7d86
2015-04-20 16:09:02 -04:00
Sean.Webb
59d0c55202
ASM #17398 - Removed tropical patterns from baseline
...
Change-Id: I95bbf55d0306d5478c4decd20bc06677b4af9c57
Former-commit-id: 869e804dcdf4cbd00314eec063a134ca0d53f443
2015-04-20 11:36:04 -04:00
Steve Harris
1d71dee037
Merge tag 'OB_14.4.1-26' into omaha_14.4.1
...
14.4.1-26
Former-commit-id: b6156ab57179bb4af118912960cf402d459ba779
2015-04-20 07:36:26 -05:00
Steve Harris
b0faa6d57f
Omaha #3299 - Added ldm-6.12.9 to open source credits
...
Former-commit-id: 2555771c8694cdcbe208362538444ec514e5d518
2015-04-15 09:15:11 -05:00
Fay.Liang
6cd66bff93
Merge tag 'OB_14.4.1-25' into master_15.1.1
...
This merge includes all changes in 14.4.1-22, -23, -24, and -25
Conflicts:
cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt
Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
2015-04-13 13:02:24 -04:00
Steve Harris
b78afa0e72
Merge tag 'OB_14.4.1-24' into omaha_14.4.1
...
14.4.4-24
Former-commit-id: 11b32bb99084a6162cd0d463800281c7115aef85
2015-04-13 08:56:12 -05:00
Fay.Liang
88d6e796f5
Merge tag 'OB_14.3.3-5' into master_14.4.1
...
Merges 14.3.3-3, 14.3.3-4, and 14.3.3-5
Former-commit-id: 66eb429aee1d602cf216f1509e780afdbd1cbd23
2015-04-10 13:49:22 -04:00
Fay.Liang
6a9a1daef6
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: a9ee3ef4fb625850df26a5a9e9f83e1c24f892d9
2015-04-10 12:13:31 -04:00
Steve Harris
6aa72398d2
Omaha #3299 - Master rights and foss for 14.4.1
...
Former-commit-id: e9c9daec3e77c8f9af54afb06318f0dce9958b50
2015-04-09 10:22:32 -05:00
Sean.Webb
b50987c66c
Merge "ASM #17189 - Removed rpm commands from profile scripts" into asm_15.1.1
...
Former-commit-id: 2ea7877fa70890bb8936c0cbe445478470cfa7de
2015-04-08 12:24:19 -05:00
Fay.Liang
7349df3d27
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config
Former-commit-id: 9742125df2b54fe54e1e06dba554de21db52f5a0
2015-04-08 12:22:27 -04:00
Brian Graham
6e631b11b2
ASM #14516 - changed handling of edexServiceList
...
Id93c1b51f91ff24b8534f71e6a6773b8a56e345c
Change-Id: I5c0fa4164d53816eb21056b4f7b52d1a8f597e22
Former-commit-id: 7035c00bf1a8b91fafa55620d645a4dce966b325
2015-04-08 11:22:20 -04:00
Fay.Liang
2301da818a
Merge branch 'field_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.3
...
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: fea365e547f12a13a942594f8267b15a7895a102
2015-04-07 15:38:18 -04:00
Ana Rivera
53807298e8
VLab Issue #7489 - Fix SFPA42 data_store entry in pqact.conf;fixes #7489
...
Change-Id: Id7675169dc22035ea9640fdf07351f8667638dd6
Former-commit-id: 2b2b0b0387932888eaa6c8e5b86fc05d7254de3a
2015-04-07 18:33:14 +00:00
Greg Armendariz
1387d6117e
Omaha #4103 - Remove svcbu.properties from RPM package list
...
Former-commit-id: d2af97d5e158148cdaafb2c619b4f393e99d4483
2015-04-01 11:12:04 -05:00
Fay.Liang
77002144a1
Merge tag 'OB_14.4.1-21' into master_15.1.1
...
14.4.1-21
Former-commit-id: f13fe9af9cb5278362da4b3c67c5997b8ecedd1a
2015-04-01 10:27:48 -04:00
Fay.Liang
133a603566
Merge tag 'OB_14.4.1-20m' into master_15.1.1
...
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 1d282a64da2998d91040a7c97f2e81beea0a8da4
2015-03-30 14:28:30 -04:00
Steve Harris
7375074ed8
Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
...
15.1.1-2m
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
2015-03-30 11:07:52 -05:00
Fay.Liang
dd7c47b911
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: f8b4d9d81247c6089960c83b57417a5ba62cdfc2
2015-03-27 15:16:09 -04:00
Fay.Liang
f3dcf799d6
Merge tag 'OB_14.3.2-24m' into master_14.4.1
...
14.3.2-24m
Conflicts:
rpms/awips2.core/Installer.gfesuite-server/component.spec
Former-commit-id: a91ad7ff32c153c34d6982f29cc497812d9f22f7
2015-03-27 15:07:28 -04:00
Sean.Webb
6679bc9519
Merge "ASM #17221 - Updated LDM to 6.12.9" into asm_14.4.1
...
Former-commit-id: ec7696a5ca44ccdebf86888d27e3fcb151576a61
2015-03-27 08:06:00 -05:00
Sean.Webb
723febe25e
ASM #17221 - Updated LDM to 6.12.9
...
Change-Id: Ib01372e3d0365404c9c8c94b951536d671ec5319
Former-commit-id: 3fb2bed462ec0cb2f985b80a4ea02192eac917db
2015-03-27 07:58:40 -04:00
Steve Harris
165971a4f6
Merge tag 'OB_14.4.1-20m' into omaha_15.1.1
...
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75
2015-03-26 09:57:17 -05:00
Sean.Webb
cd838863a7
ASM #17189 - Removed rpm commands from profile scripts
...
Change-Id: Id6abd356376c29a179278a127828e8616cc66fbd
Former-commit-id: 0b51d70c7f71fdecdc2f4ab0988d1d1161019030
2015-03-24 14:31:17 -04:00
Fay.Liang
86a8041062
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Fay.Liang
475019fb61
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e
2015-03-18 15:12:56 -04:00
Fay.Liang
3233640aa2
Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 42d435f739134ec29a021415ed96b6c3406fc021
2015-03-18 14:54:46 -04:00
Steve Harris
67b3a77c4f
Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
...
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
2015-03-18 09:29:01 -05:00
Sean.Webb
506090817b
ASM #17181 - Updated pqact.conf.template for MRMS, HRRR and ESTOFS
...
Change-Id: Ifd691a453dd201c04a297aa54068a9557b1b03e6
Former-commit-id: f3164dc891d77c84d12e745a7ece5bd7eddfa0ee
2015-03-17 11:31:56 -04:00
Melissa Porricel
fcdcb81963
ASM #7951 - Add Capabilities for CONUS RTMA at 2.5km
...
Change-Id: Iab79fc17b3b648ffa39c8385c581392e3cf58f9c
Former-commit-id: 9c7d466213eaac3a46fddf416967d00e3446bfee
2015-03-16 17:14:56 -04:00
