Fay.Liang
65d91d9113
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 7bc10075e5d29d86ad05
2015-01-27 12:08:28 -05:00
Ana Rivera
62094315d2
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: 327945af8b7c5fc26537
2015-01-27 16:28:42 +00:00
Shawn.Hooper
0a91e7cf47
ASM #17071 - Add tokens for Alert Alarm System
...
Change-Id: Idec6bd4aabe6d317c1cc168113a346567d30b189
Former-commit-id: 87575853869ca10f111a
2015-01-27 11:22:56 -05:00
Ron Anderson
178ad50f20
Merge "Omaha #4033 Fix logging in configureTextProducts" into omaha_14.4.1
...
Former-commit-id: 3a804c4be7d97b54018c
2015-01-27 08:59:12 -06:00
Ron Anderson
0dc17a57a2
Omaha #4033 Fix logging in configureTextProducts
...
Change-Id: I1d2de04b532a3d543418d42c76e499cde2c04030
Former-commit-id: 29930e52b313bfa6e362
2015-01-26 17:50:28 -06:00
Ana Rivera
654d08a588
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: 7c25945fd998ac97e397
2015-01-26 18:45:26 +00:00
Shawn.Hooper
e6c4f29036
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e84a037b2e568b7c801a
2015-01-26 11:22:49 -05:00
Nate Jensen
7e8d355f62
Omaha #3952 remove custom gzip handling since it is by default enabled
...
by apache httpclient
Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802
Former-commit-id: c4598baf1963189329a1
2015-01-26 09:10:36 -06:00
Roger Ferrel
cc869c167f
Omaha #3763 Update xml tags to match labels in the ArchiveRetentionDlg dialog.
...
Change-Id: I9d8344fdecb16d75bfa360d403ab84312f6bfe0e
Former-commit-id: d1941fd84e5e91714487
2015-01-26 07:46:00 -06:00
Steve Harris
b0c09c3ff7
Merge tag 'OB_14.4.1-2m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)
Former-commit-id: 9234ceb4852c559f4c88
2015-01-23 09:32:44 -06:00
Steve Harris
8cd9e2e92f
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: 0f05c53a53158fa16376
2015-01-23 09:08:06 -06:00
Daniel.Huffman
f4ac238888
ASM #17057 RadarDecoder::AlertMessageSanityCheck
...
Change-Id: Iedf6a1255184a3bde4b9a879a5cc4a0ecfb0ef0c
Former-commit-id: a25fa81a0f845998cbfa
2015-01-22 21:13:04 +00:00
Shawn.Hooper
7839dab5e6
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: a757b554460bc501bd4c
2015-01-22 16:05:41 -05:00
Dave Hladky
5fd928ec4c
Omaha #3918 Central registry web interface broken by DPA fix.
...
Former-commit-id: a15e67385ac1127b066f
2015-01-22 13:22:18 -06:00
Nathan Bowler
42e98486a4
Omaha #3949 Add lightning source to SCAN site run config and filter on it.
...
Change-Id: Ic8a13effa112f6858a34b07c65ddae5a592d9be5
Former-commit-id: 4dd5b6999cefd13e5442
2015-01-22 12:15:00 -05:00
Ana Rivera
4f8900fd23
VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082
...
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f
Former-commit-id: 18b9d5d1637b47ffe362
2015-01-22 16:11:44 +00:00
Juliya Dynina
a72a325521
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: 7dfa9e281b64d09c6982
2015-01-21 09:08:36 -05:00
Ron Anderson
c8fba0cc0b
Omaha #4013 Change rsyncGrdsToCWF_client.sh to use any available EDEX cluster member
...
Change-Id: If2370cf73ec816bbac2a9b46ebbc8fb720eae805
Former-commit-id: f7b327f1f66b8705ee39
2015-01-20 16:46:47 -06:00
Qinglu.Lin
761fc43aad
ASM #14929 - Baseline change needed to prevent getting marine locations outside of CWA in impact SMW's
...
Change-Id: I843e5dd289c9e2841a28b228a8dbc38dce965ad1
Former-commit-id: 30b5bc6a6294ee166aa1
2015-01-20 16:20:58 -05:00
David Gillingham
a6b2a5cabf
Omaha #4014 : Add ingest and display support for ETSS model.
...
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846
Former-commit-id: 460497585441af2f661c
2015-01-20 14:02:06 -06:00
Ron Anderson
cbf8da3e81
Merge "Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data" into omaha_15.1.1
...
Former-commit-id: b7b7670bd903df152b3d
2015-01-19 15:08:31 -06:00
Ron Anderson
6e97b2dd31
Merge "Omaha #3955 Move GridType enum into GridParmInfo where it belongs" into omaha_15.1.1
...
Former-commit-id: 305d1901fdb58904fe25
2015-01-19 15:08:08 -06:00
Ron Anderson
e238360309
Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data
...
Change-Id: Ic12b1e257b7997fc2fbc5efd7a8833ac26366135
Former-commit-id: ea2dbf54ff596149053f
2015-01-19 14:02:42 -06:00
Ron Anderson
79dc5f3c98
Omaha #3955 Move GridType enum into GridParmInfo where it belongs
...
Change-Id: Ia9265527302d8ff9213e8f55f63e5b6b91bdcd98
Former-commit-id: a955bd6e365dfd9d6f8c
2015-01-16 12:33:52 -06:00
Ron Anderson
8315f9676f
Merge "Omaha #3996 NullPointerException Occurs when Drawing and Issuing Hazards" into omaha_15.1.1
...
Former-commit-id: 59b82d777c899235138c
2015-01-16 11:03:14 -06:00
Richard Peter
1e18beb632
Merge "Omaha #3789 removed unnecessary arguments to uengine jetty endpoint" into omaha_15.1.1
...
Former-commit-id: a889ad4845a754644505
2015-01-15 13:43:12 -06:00
Brian Clements
7376ebced9
Omaha #3789 removed unnecessary arguments to uengine jetty endpoint
...
Change-Id: I9442351c05ecf4a67ea05b536ef94bbd26c214f3
Former-commit-id: b46ebe774344acb69ede
2015-01-15 09:28:26 -06:00
Chris Cody
b6384cf0e0
Omaha #3996 NullPointerException Occurs when Drawing and Issuing Hazards
...
Change-Id: I2ccc6596bbff035a4904a1fa6b0fe45c3416c85e
Former-commit-id: 14f12323d38b70f9f919
2015-01-14 15:48:13 -06:00
Nate Jensen
f88f62191f
Omaha #3993 ensure important dataplugin utility folders are included in
...
viz builds
Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747
Former-commit-id: b434ae134305307be9d0
2015-01-13 16:47:04 -06:00
Fay.Liang
1934dedd2d
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: a09a27a96313fb781066
2015-01-13 14:35:30 -05:00
Ron Anderson
6248c878ff
Issue #3990 Remove multiple smartInit restriction added by DR #3146
...
Change-Id: I6231da05828bcc76489793c7cf8acd29468b4516
Former-commit-id: 0dab6f479703c265fc9f
2015-01-13 11:03:02 -06:00
Fay.Liang
1ee2bb76da
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: a7708f9cf5ffa13d9264
2015-01-13 11:58:25 -05:00
Sarah Pontius
43bab0465c
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
...
Change-Id: I0418ffe2cb01337f8549ea2c8021a8e5b566b563
Former-commit-id: 283f682aea4bacb954fe
2015-01-13 09:04:28 -07:00
Fay.Liang
a713238fc1
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 50ab069dbcd193ca5eb6
2015-01-12 14:55:55 -05:00
Slav Korolev
f08d184cfc
Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
...
Former-commit-id: b8ab18d3e19c57dab437
2015-01-12 14:32:31 -05:00
Fay.Liang
6b77894bd0
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: eed6737801c6bd5d7675
2015-01-12 13:03:31 -05:00
Ana Rivera
9efaf97304
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: a07ca6b0403a08e54bfc
2015-01-12 17:43:07 +00:00
Nathan Bowler
1874216fe0
Omaha #3897 Better handle invalid Section 2 data.
...
Change-Id: I50ce32553027d90e677f001efd6bc27fd6e9a091
Former-commit-id: c562618d28c75c052122
2015-01-12 11:27:55 -05:00
Nate Jensen
c37ffcde90
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: 06054344dd44f0f7aafc
2015-01-12 09:22:30 -06:00
Sarah Pontius
3225a94aef
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
...
Change-Id: I248822f54d31eb5e0a7312171acf1d59dde7c73d
Former-commit-id: 1159e8487cc31b766be6
2015-01-09 15:13:45 -07:00
Michael Gamazaychikov
1aa98e754a
ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
...
Change-Id: Ife5ecb2c5823d4d34c1b4af6dc53fa360074b7bb
Former-commit-id: e007fac30fbae8d9ea3f
2015-01-09 15:07:29 -05:00
Ron Anderson
a1a11a4243
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: cd8f684a9957de590a3e
2015-01-09 10:48:51 -06:00
Nate Jensen
8a3e16741b
Merge "Omaha #3789 moved common.http to ufcore, reworked camel http endpoints" into omaha_15.1.1
...
Former-commit-id: 4b68187da9abedf22aca
2015-01-09 10:18:20 -06:00
Brian Clements
a202178cac
Omaha #3789 moved common.http to ufcore, reworked camel http endpoints
...
Change-Id: Ie1363cb5198c3d90129f5d46465883234f06c58e
Former-commit-id: 87e4d0aada35f38f99bf
2015-01-08 14:50:36 -06:00
Ying-Lian.Shi
4109770c59
ASM #15035 - Add SFMG WNJ GFE Domain definition to baseline serverConfig, double quote to sigle quote
...
Change-Id: I9c652fdc3440d8c15a0c443a6b80a8a10877693e
Former-commit-id: c99e199a693e1d1aa814
2015-01-08 15:28:54 +00:00
Brian Clements
4209445cc0
Omaha #3692 alert alarm record is no longer a singleton
...
Change-Id: Ib995bc47699c515c2702e5aab677929a939a62a8
Former-commit-id: 48b452b7b4d654550e11
2015-01-07 13:55:24 -06:00
Juliya Dynina
206a985f23
Merge "ASM #632 -Filter erroneous RPG alert messages." into asm_14.4.1
...
Former-commit-id: 2efa96316ed0072cd181
2015-01-07 09:02:32 -05:00
Daniel.Huffman
22f923eaf5
ASM #632 -Filter erroneous RPG alert messages.
...
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e
Former-commit-id: 7a563dd5059db291b296
2015-01-07 00:41:35 +00:00
Dave Hladky
c6aca09cf3
Omaha #3918 Fix for standalone clients not starting due to central registry non-existance.
...
Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292
Former-commit-id: 36ab95205f66aa4b2fbf
2015-01-06 14:37:01 -06:00
Brian Clements
111c81d35c
Omaha #2707 replaced LSR officeId constraint with stationId
...
Change-Id: I05fef0c56801fa907e45da3400437e71ce0e38dd
Former-commit-id: ac952bc760acc9e8630d
2015-01-06 12:33:06 -06:00
