Ana Rivera
8bfa7c4087
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 291d66c66af4f1f4d298185412d5930714ffb2c5
2015-01-27 22:05:59 +00:00
Steve Harris
1891ed5e5b
Merge branch 'master_14.4.1' (14.4.1-4) into omaha_14.4.1
...
Former-commit-id: cfd0a31a17fc4a92af6db3f034d46b01996d2cc0
2015-01-27 11:34:06 -06:00
Fay.Liang
d29d86ad05
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 6ad30059fa7249aba100a39c7c39215212a929cc
2015-01-27 12:08:28 -05:00
Ana Rivera
7c5fc26537
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18
Former-commit-id: 889608360567b829f81ed6392c64c669798f34a9
2015-01-27 16:28:42 +00:00
Shawn.Hooper
9ca10f111a
ASM #17071 - Add tokens for Alert Alarm System
...
Change-Id: Idec6bd4aabe6d317c1cc168113a346567d30b189
Former-commit-id: 2bba487d259e87c20e43a8e10573392dca011206
2015-01-27 11:22:56 -05:00
Ron Anderson
d97b54018c
Merge "Omaha #4033 Fix logging in configureTextProducts" into omaha_14.4.1
...
Former-commit-id: aa7900e79f0ce9074c32ad0785dd9d0ccbfa64ba
2015-01-27 08:59:12 -06:00
Ron Anderson
13bfa6e362
Omaha #4033 Fix logging in configureTextProducts
...
Change-Id: I1d2de04b532a3d543418d42c76e499cde2c04030
Former-commit-id: 1c1fefe7cc5cf26abf7c60254132ddeb22585b26
2015-01-26 17:50:28 -06:00
Ana Rivera
98ac97e397
Merge branch 'master_14.4.1' into emc_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
2015-01-26 18:45:26 +00:00
Shawn.Hooper
568b7c801a
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 95cdc2d817eac840017fc14746c2ada498f1a716
2015-01-26 11:22:49 -05:00
Nate Jensen
63189329a1
Omaha #3952 remove custom gzip handling since it is by default enabled
...
by apache httpclient
Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802
Former-commit-id: 4f67ebeb092d182ec0a4e5078e668313d8cc6a57
2015-01-26 09:10:36 -06:00
Steve Harris
158fa16376
Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
...
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
Former-commit-id: 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79
2015-01-23 09:08:06 -06:00
Daniel.Huffman
845998cbfa
ASM #17057 RadarDecoder::AlertMessageSanityCheck
...
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c
Former-commit-id: 498f55c757f20f70b11a921a2e5948c3c7c49c90
2015-01-22 21:13:04 +00:00
Shawn.Hooper
0bc501bd4c
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: d53c809149da23fcae51138cc45c57aecd641794
2015-01-22 16:05:41 -05:00
Dave Hladky
c1127b066f
Omaha #3918 Central registry web interface broken by DPA fix.
...
Former-commit-id: 5aa305adb5fd16c72ce557309cab28fd287379d9
2015-01-22 13:22:18 -06:00
Ana Rivera
7b47ffe362
VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082
...
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f
Former-commit-id: 8a66266d3ffa236343f14089d7e7b32c1060f9ea
2015-01-22 16:11:44 +00:00
Juliya Dynina
64d09c6982
Merge "ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's" into asm_14.3.1
...
Former-commit-id: 61f9feec5bf02baefbef740cc16cbc90688242ad
2015-01-21 09:08:36 -05:00
Qinglu.Lin
94ee166aa1
ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's
...
Change-Id: I843e5dd289c9e2841a28b228a8dbc38dce965ad1
Former-commit-id: d4e1fca39f82eb39fc911c091eb579a785a6cef9
2015-01-20 16:20:58 -05:00
Nate Jensen
05307be9d0
Omaha #3993 ensure important dataplugin utility folders are included in
...
viz builds
Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747
Former-commit-id: 9f30c7195d6a62206bae05d6e17df4a8e068255e
2015-01-13 16:47:04 -06:00
Fay.Liang
13fb781066
ASM #15311 - Merge changes from asm_14.4.1 into master_14.4.1
...
Merge branch 'asm_14.4.1' into master_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
Former-commit-id: 67315d8c5f28f5ed5e0870f65de30a9c2c2bd290
2015-01-13 14:35:30 -05:00
Ron Anderson
03c265fc9f
Issue #3990 Remove multiple smartInit restriction added by DR #3146
...
Change-Id: I6231da05828bcc76489793c7cf8acd29468b4516
Former-commit-id: c4ba2394228935c7725688c11b91c3de130d586b
2015-01-13 11:03:02 -06:00
Fay.Liang
ffa13d9264
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: f0ed1b055a21c765e6dec0dde0a066089892dd06
2015-01-13 11:58:25 -05:00
Sarah Pontius
4bacb954fe
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
...
Change-Id: I0418ffe2cb01337f8549ea2c8021a8e5b566b563
Former-commit-id: 01f727b4b033f80a206533cbf5404c38d12a6fde
2015-01-13 09:04:28 -07:00
Fay.Liang
d193ca5eb6
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: f0c6dcb30718baede5c31bcb267d3b4524252ab8
2015-01-12 14:55:55 -05:00
Slav Korolev
9c57dab437
Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
...
Former-commit-id: 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e
2015-01-12 14:32:31 -05:00
Fay.Liang
c6bd5d7675
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
...
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
Ana Rivera
3a08e54bfc
Merge "VLab Issue #4953 Run NWRWAVES script for both TCV and HLS. Don't attempt to send TCV backup files in practice mode." into tcv_14.3.2
...
Former-commit-id: 07634aa73cbb07182302518513a54ded9fd69641
2015-01-12 17:43:07 +00:00
Nate Jensen
44f0f7aafc
Merge "Omaha #3918 Fix for standalone clients not starting due to central registry non-existance. Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292" into omaha_14.4.1
...
Former-commit-id: 5fc926b7e735f2c92b16a85a7ba5f663a443ea53
2015-01-12 09:22:30 -06:00
Sarah Pontius
c31b766be6
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
...
Change-Id: I248822f54d31eb5e0a7312171acf1d59dde7c73d
Former-commit-id: 9cf4ca3c746accf745172bd7dc85e851da95ab6f
2015-01-09 15:13:45 -07:00
Michael Gamazaychikov
bae8d9ea3f
ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
...
Change-Id: Ife5ecb2c5823d4d34c1b4af6dc53fa360074b7bb
Former-commit-id: 38eabd6196df1576970019f2b0255d3f39a825a9
2015-01-09 15:07:29 -05:00
Ron Anderson
57de590a3e
VLab Issue #4953 Run NWRWAVES script for both TCV and HLS.
...
Don't attempt to send TCV backup files in practice mode.
Change-Id: I70cc4a4014a0f1e34d8c2d3eab39a76289ca9daa
Former-commit-id: 3a60037251b7dd393d85a613c5685d5338927e61
2015-01-09 10:48:51 -06:00
Ying-Lian.Shi
3e1d1aa814
ASM #15035 - Add SFMG WNJ GFE Domain definition to baseline serverConfig, double quote to sigle quote
...
Change-Id: I9c652fdc3440d8c15a0c443a6b80a8a10877693e
Former-commit-id: af67fa0f955b35c7b9b141fef507a5db805eaa27
2015-01-08 15:28:54 +00:00
Juliya Dynina
d0072cd181
Merge "ASM #632 -Filter erroneous RPG alert messages." into asm_14.4.1
...
Former-commit-id: 503e8a59c9608c3094d817e3e2d5e07250c0e0e5
2015-01-07 09:02:32 -05:00
Daniel.Huffman
9db291b296
ASM #632 -Filter erroneous RPG alert messages.
...
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e
Former-commit-id: d7d3bc55053f16da410d3ebe1ef055e93d198790
2015-01-07 00:41:35 +00:00
Dave Hladky
66aa4b2fbf
Omaha #3918 Fix for standalone clients not starting due to central registry non-existance.
...
Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292
Former-commit-id: d8a52577bbe13f53f9afbbae354e8bc58e11a0ed
2015-01-06 14:37:01 -06:00
Brian Clements
acc9e8630d
Omaha #2707 replaced LSR officeId constraint with stationId
...
Change-Id: I05fef0c56801fa907e45da3400437e71ce0e38dd
Former-commit-id: e0cd69f020d351f0aaefd5b35ffb369e44a04e48
2015-01-06 12:33:06 -06:00
Rici.Yu
97c7681e01
ASM #16942 - GFE: VTEC Active Tables not getting purged
...
Change-Id: Ia00f0c5d9f0a9f8abadde271f3608fd4e786a60b
Former-commit-id: a98e1f924bf0b99657dd56241c02f529c5e48ce7
2014-12-30 13:56:02 -05:00
Fay.Liang
06061eee19
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 0edb5ba1c9cad9e2933ab86d57ec5e4f355d244d
2014-12-22 14:43:32 -05:00
Nathan Bowler
863ac95fef
Omaha #3600 Implement getAvailableLevels() for radar to increase inventory performance.
...
Change-Id: I168bd135ae3ddd386761bb87b9160eb97f718642
Former-commit-id: 6f9709b43d307494dfa702030b961964ec8d2170
2014-12-19 12:56:43 -05:00
Ana Rivera
57d8d5794d
VLab Issue #5704 - Update NWPS: runManualNWPS_OutsideAWIPS.sh; fixes #5704
...
Change-Id: I32484682f1eb2bccd286673a1ea15cebd8df9320
Former-commit-id: b016c3bcb587c04b4d0e5d21ecce6f5e6bb3e75d
2014-12-18 14:13:24 +00:00
Ron Anderson
7a0b6b2cab
VLab Issue #4953 Fix pracice mode decoding of non-VTEC products
...
Change-Id: I0e2e9a21267e7b9e3896154587a0e53841081d56
Former-commit-id: 4cddd47d0870f4ba3474238107381693c768f6b1
2014-12-17 16:15:39 -06:00
Kiran.Shrestha
8216ea6b6b
ASM #622 Total Precipitable Water (TPW) satellite field should be displayed in inches
...
Change-Id: Ia7aba807682f559f11522491f7d64280eef9eac0
Former-commit-id: 039ccf8cf811b9e4f868138da8074df3ea4a862a
2014-12-17 21:20:57 +00:00
Juliya Dynina
aaf04680c4
Merge "ASM #14638 trigger compare fixed." into asm_14.4.1
...
Former-commit-id: 61e8a1bf2cd87ac9ee16cb8969ba3d74ba4dd514
2014-12-17 10:05:42 -05:00
Joshua Watson
3f2f7f2f3a
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
...
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29
2014-12-17 08:38:27 -05:00
Daniel.Huffman
9484ea870e
ASM #14638 trigger compare fixed.
...
Change-Id: I5dc06e8a509a9eeb2afa0c41b84a64b502f5e012
Former-commit-id: ba6ed158aa84958ad791f2b83e5f95b0cb302f20
2014-12-17 06:20:52 +00:00
Ana Rivera
043bc3a8b7
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129 , #5421 , #5345 .
...
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 111ae763e6becb944e34e262e1d87d2d344236e4
2014-12-16 23:39:02 +00:00
Mike Duff
b98cc4c385
Issue #3026 - Implement last minute requirement change, change location of text on screen
...
Change-Id: I2f8fb480a3259bae71f7c09e46e393a413972378
Former-commit-id: 773590a3936ca34be68cb5b19ae8fbf027085926
2014-12-16 13:13:37 -06:00
Ana Rivera
2eec9d9557
VLab Issue #4365 Decode Ensemble Kernel Density MOS (EKDMOS); fixes 4365
...
Change-Id: I1272721f43ee78b310fcf74227317cf27e8d6b28
Former-commit-id: cb236c208fe6489f88144adab3178dccd4a826db
2014-12-16 16:39:22 +00:00
Sarah Pontius
0bd53be339
VLab Issue #5682 - HLS/TCV SwIT Changes; fixes #5682
...
Former-commit-id: b5a49fa57d2168e4680b0329b99733e35381eeb9
2014-12-16 09:06:59 -07:00
Zhidong.Hao
e443ced7f1
ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
...
Change-Id: I656058629e2982a20312fca7f7024db82a8ad2fb
Former-commit-id: 133d3f229145c8ac84f31a8a6becc98688d189ae
2014-12-16 10:16:35 -05:00
Steve Harris
8d61bfc358
Merge branch 'master_14.3.1' (14.3.1-38) into omaha_14.3.1
...
Former-commit-id: 8b512a56879fe37cdb5e3428f6f3d86f38349ed6
2014-12-15 13:31:21 -06:00
