Steve Harris
47234a3757
Merge tag 'OB_14.4.1-5m' into omaha_15.1.1
...
14.4.1-5
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
Former-commit-id: 28075dabb4b6421ddaee3af71518f565d9bc7e90
2015-01-28 13:45:36 -06:00
Steve Harris
8eb10d0456
Merge tag 'OB_14.4.1-4m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/DataProviderEventController.java
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/AlertalarmRecord.java
Former-commit-id: 714ca199f27013313099920bb9f55009c794f7f8
2015-01-27 11:56:24 -06:00
Fay.Liang
7bc10075e5
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
7c25945fd9
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
e84a037b2e
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
Roger Ferrel
d1941fd84e
Omaha #3763 Update xml tags to match labels in the ArchiveRetentionDlg dialog.
...
Change-Id: I9d8344fdecb16d75bfa360d403ab84312f6bfe0e
Former-commit-id: 083ba10ef9ecdae0c2a242f432641b7659fdc822
2015-01-26 07:46:00 -06:00
Steve Harris
9234ceb485
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: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
2015-01-23 09:32:44 -06:00
Steve Harris
0f05c53a53
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
Shawn.Hooper
a757b55446
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
a15e67385a
Omaha #3918 Central registry web interface broken by DPA fix.
...
Former-commit-id: 5aa305adb5fd16c72ce557309cab28fd287379d9
2015-01-22 13:22:18 -06:00
Nathan Bowler
4dd5b6999c
Omaha #3949 Add lightning source to SCAN site run config and filter on it.
...
Change-Id: Ic8a13effa112f6858a34b07c65ddae5a592d9be5
Former-commit-id: 4817945b7eadadca996dd1e3d037a2b2de297ec4
2015-01-22 12:15:00 -05:00
Ron Anderson
f7b327f1f6
Omaha #4013 Change rsyncGrdsToCWF_client.sh to use any available EDEX cluster member
...
Change-Id: If2370cf73ec816bbac2a9b46ebbc8fb720eae805
Former-commit-id: e2f809e7b48f83b5abeb4dcda0c7e96a160e7fbf
2015-01-20 16:46:47 -06:00
David Gillingham
4604975854
Omaha #4014 : Add ingest and display support for ETSS model.
...
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846
Former-commit-id: fa7e11a22b47a48d2bc7b9cf6f0ddfd97ea2fea7
2015-01-20 14:02:06 -06:00
Ron Anderson
b7b7670bd9
Merge "Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data" into omaha_15.1.1
...
Former-commit-id: 27d20161a120d027cc0d2ed892384cdc00faeba5
2015-01-19 15:08:31 -06:00
Ron Anderson
305d1901fd
Merge "Omaha #3955 Move GridType enum into GridParmInfo where it belongs" into omaha_15.1.1
...
Former-commit-id: e541806ce417494bb65248a5d09f8fa5585bedd9
2015-01-19 15:08:08 -06:00
Ron Anderson
ea2dbf54ff
Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data
...
Change-Id: Ic12b1e257b7997fc2fbc5efd7a8833ac26366135
Former-commit-id: 653d8ec5a7adfc2ebb87ec6cbde2715f9c8fcfe9
2015-01-19 14:02:42 -06:00
Ron Anderson
a955bd6e36
Omaha #3955 Move GridType enum into GridParmInfo where it belongs
...
Change-Id: Ia9265527302d8ff9213e8f55f63e5b6b91bdcd98
Former-commit-id: 9bad7ebc912f6dbf9642f250494a992bc522252c
2015-01-16 12:33:52 -06:00
Ron Anderson
59b82d777c
Merge "Omaha #3996 NullPointerException Occurs when Drawing and Issuing Hazards" into omaha_15.1.1
...
Former-commit-id: c6cacfdda1724ff43da04221f5fc2fbb0d9e3ae2
2015-01-16 11:03:14 -06:00
Richard Peter
a889ad4845
Merge "Omaha #3789 removed unnecessary arguments to uengine jetty endpoint" into omaha_15.1.1
...
Former-commit-id: 7f514d51ea7858681fa22e923677e6f4e9d51631
2015-01-15 13:43:12 -06:00
Brian Clements
b46ebe7743
Omaha #3789 removed unnecessary arguments to uengine jetty endpoint
...
Change-Id: I9442351c05ecf4a67ea05b536ef94bbd26c214f3
Former-commit-id: 9f1eee3bcf4eb5e72c433055d2f2b5727056ee39
2015-01-15 09:28:26 -06:00
Chris Cody
14f12323d3
Omaha #3996 NullPointerException Occurs when Drawing and Issuing Hazards
...
Change-Id: I2ccc6596bbff035a4904a1fa6b0fe45c3416c85e
Former-commit-id: 0b64b70ab9c1f518062fd8f0c78ac51abea6e11b
2015-01-14 15:48:13 -06:00
Nate Jensen
b434ae1343
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
a09a27a963
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
Slav Korolev
b8ab18d3e1
Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
...
Former-commit-id: 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e
2015-01-12 14:32:31 -05:00
Fay.Liang
eed6737801
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
Nathan Bowler
c562618d28
Omaha #3897 Better handle invalid Section 2 data.
...
Change-Id: I50ce32553027d90e677f001efd6bc27fd6e9a091
Former-commit-id: c5ff89d216e9df47330efb6560d47406ac3601fe
2015-01-12 11:27:55 -05:00
Nate Jensen
06054344dd
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
Michael Gamazaychikov
e007fac30f
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
Nate Jensen
4b68187da9
Merge "Omaha #3789 moved common.http to ufcore, reworked camel http endpoints" into omaha_15.1.1
...
Former-commit-id: 125ef3257c2aeb59b8157b19c5f84342a832143b
2015-01-09 10:18:20 -06:00
Brian Clements
87e4d0aada
Omaha #3789 moved common.http to ufcore, reworked camel http endpoints
...
Change-Id: Ie1363cb5198c3d90129f5d46465883234f06c58e
Former-commit-id: d81c8f6708e25c93df3dd199293d47f326dea61a
2015-01-08 14:50:36 -06:00
Ying-Lian.Shi
c99e199a69
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
Brian Clements
48b452b7b4
Omaha #3692 alert alarm record is no longer a singleton
...
Change-Id: Ib995bc47699c515c2702e5aab677929a939a62a8
Former-commit-id: ff9be6a031b01f96eca5c390d2c5156069cfc3bd
2015-01-07 13:55:24 -06:00
Juliya Dynina
2efa96316e
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
7a563dd505
ASM #632 -Filter erroneous RPG alert messages.
...
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e
Former-commit-id: d7d3bc55053f16da410d3ebe1ef055e93d198790
2015-01-07 00:41:35 +00:00
Dave Hladky
36ab95205f
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
ac952bc760
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
483d0216da
ASM #16942 - GFE: VTEC Active Tables not getting purged
...
Change-Id: Ia00f0c5d9f0a9f8abadde271f3608fd4e786a60b
Former-commit-id: a98e1f924bf0b99657dd56241c02f529c5e48ce7
2014-12-30 13:56:02 -05:00
Nathan Bowler
a674630b92
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
77d66167f0
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
Kiran.Shrestha
991f4c22c8
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
9b4ae6de7e
Merge "ASM #14638 trigger compare fixed." into asm_14.4.1
...
Former-commit-id: 61e8a1bf2cd87ac9ee16cb8969ba3d74ba4dd514
2014-12-17 10:05:42 -05:00
Daniel.Huffman
a91ea93823
ASM #14638 trigger compare fixed.
...
Change-Id: I5dc06e8a509a9eeb2afa0c41b84a64b502f5e012
Former-commit-id: ba6ed158aa84958ad791f2b83e5f95b0cb302f20
2014-12-17 06:20:52 +00:00
Zhidong.Hao
c3b623cb6d
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
Juliya Dynina
88fbcaa849
Merge "ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer." into asm_14.4.1
...
Former-commit-id: 45ad574592e05ba3f9a0f27b2afd2c9a0e5d19a2
2014-12-15 12:25:14 -05:00
Michael Gamazaychikov
ce2c685da4
ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer.
...
Change-Id: I74ff5b0abb7df0434bb7f66db080447a9d644266
Former-commit-id: 5c31d213c84dfa701eda80712ad5014bf4a012aa
2014-12-15 08:40:22 -05:00
Richard Peter
8de1ebcb65
Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java
Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5
Former-commit-id: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
2014-12-12 10:36:04 -06:00
Jingtao Deng
831dbd1db6
VLab Issue #5062 - DR17605 Hydro Alert/Alarm mismatched report format between A1 and A2; fixes #5062
...
Change-Id: Ie5d29a5f2d375d473fe79b990019f757b20ad0bc
Former-commit-id: ae2c45f9cd0ee5ecb8278ec99cb145525b2ce3a3
2014-12-11 11:14:52 -05:00
Juliya Dynina
bcb7eb353c
Merge "ASM #16859 - Text decoder processes collectives inefficiently" into asm_14.4.1
...
Former-commit-id: ab502407cff717bb5cb86f79544c0665dd8a41f9
2014-12-09 12:22:39 -05:00
David Gillingham
ae5a0f55d1
Omaha #3885 : Fix purging of practice VTECproducts when submitted in simulated time.
...
Change-Id: I5c4afa6ab0faf975388a25916d6616ce9eb05098
Former-commit-id: 35ae2af301ec8b66a65e1564c17f6e3f8d7623d2
2014-12-09 11:21:29 -06:00
Slav Korolev
63026ac59b
Omaha #3873 - Fixed assigning timeObs for maritime record.
...
Former-commit-id: ccdf4928b9527e85684fb0d4eaa67435f8da5559
2014-12-05 14:29:15 -05:00
