Steve Harris
b5f51e446c
Merge tag 'OB_14.4.1-16m' into omaha_14.4.1
...
14.4.1-16m
Former-commit-id: ed67f8932f910a858b32b503fc8009e39dac03ab
2015-03-09 11:39:50 -05:00
Ron Anderson
d2d0d0f573
Merge "Omaha #4128 : Fix NullPointerException in FetchActiveTableSrv.preStop()." into omaha_14.4.1
...
Former-commit-id: 4100c8f8d3f05a47676f2a5a7ee0bcf4d0151733
2015-03-05 11:52:13 -06:00
David Gillingham
3fc30a2584
Omaha #4128 : Fix NullPointerException in FetchActiveTableSrv.preStop().
...
Change-Id: I52f7181d2e6585f4e1b84e949212324d308529cc
Former-commit-id: 92b8782bb0c874e78e00d848c71c8140ff71e6ac
2015-03-05 10:08:14 -06:00
Fay.Liang
aa2fa72260
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 10b981ac5353585985f450b849006bd6514fe057
2015-03-05 10:39:44 -05:00
Ron Anderson
0f7f415204
Omaha #4129 Fix exception handling on subprocess calls in IrtServer.py
...
Change-Id: Id0923f0ee4ae61f45df6f336fc856e8d27897990
Former-commit-id: 30bfaf9432481328ed9d23ef56568a857cf775c7
2015-03-05 08:56:48 -06:00
Ron Anderson
a6167718b2
Merge "Omaha #4129 Log active table changes from ingestAT" into omaha_14.4.1
...
Former-commit-id: eaecbaa0b66153b43bfe59f96c43a1876b9e235f
2015-03-04 16:06:41 -06:00
Ron Anderson
3468d2ee60
Omaha #4129 Log active table changes from ingestAT
...
Change-Id: I19dee195785363bba0008419fbf156b2d74cf6dc
Former-commit-id: 009e56509930c8fdf2eacd250903260a13a6f3ca
2015-03-04 15:37:22 -06:00
David Gillingham
07805e808c
Omaha #4128 : Ensure active table sharing is configured before enabling it.
...
Change-Id: Ib42a251f5d9c134da7ba484582ce60d653a06937
Former-commit-id: 3ebb60db47fc74a77eea56ae7738b5f7b405fb19
2015-03-03 16:46:39 -06:00
Michael Gamazaychikov
6897cfd7b9
ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
...
Change-Id: I5772661758a26c47019c3939ceff73ca0eb6f50e
Former-commit-id: ab0f7f0f627ab3926a219940f1267dc460e74e14
2015-03-03 09:38:34 -05:00
David Gillingham
d7c0000508
Omaha #4128 : Move FetchActiveTableSrv to edex.gfe plugin, fix cluster failover of service.
...
Change-Id: I99132eb075f3ccf4dd8b679d61c992e7029e1a31
Former-commit-id: 5d962bf6cf7a3e40ee152bc98817daf116633f60
2015-02-26 15:57:47 -06:00
Steve Harris
12929f7412
Merge tag 'OB_14.4.1-13m' into omaha_14.4.1
...
14.4.1-13
Former-commit-id: c75f0f600cc312a83275b767165471b458da18b7
2015-02-20 09:57:49 -06:00
Richard Peter
1184d7629c
Omaha #4125 - Fix jaxb performance issue
...
Change-Id: I7b306098a96b86fb5a9c1262b2fb92f5f24ba0b1
Former-commit-id: 9f81dd0ec5e00827f5a9a98376f15c5139908ce1
2015-02-19 14:25:12 -06:00
Ron Anderson
a3bced0160
Omaha #4139 Fix handling of pre-epoch dates in ISC
...
Change-Id: I116f35c34544319bf9875aaeea82d24751b2cca2
Former-commit-id: 2718eab540d66cac4ac88f01b840bdf23bc0562b
2015-02-18 11:28:34 -06:00
Ana Rivera
420132b396
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209
Former-commit-id: f6b3765fc1670db2b9ceef75be7422a07b2badcf
2015-02-11 22:00:40 +00:00
Steve Harris
3fe3d35339
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
...
14.4.1-10
Former-commit-id: 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2
2015-02-11 15:53:38 -06:00
Joshua Watson
56627a9012
VLab Issue #6421 - Source in GFSLAMPGrid.py smart init changed to GFSLAMPGrid. Visibility calculation streamlined; fixes #6421
...
Change-Id: Ic63cb16c30aff1705d9753017a43ba9c59b02d51
Former-commit-id: c570ea9f982665f3cb560c665cea6357c11841ce
2015-02-11 09:04:44 -05:00
Ana Rivera
bdb0e3aacb
Merge branch 'omaha_14.4.1' into field_14.4.1
...
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f
Former-commit-id: c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265
2015-02-10 14:41:19 +00:00
Fay.Liang
59f3f87190
Merge branch 'master_14.3.2' into master_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: e91a78eec910b84f44350d3aae68a26f4e0dcd72
2015-02-09 17:19:41 -05:00
Joshua Watson
05c119663f
VLab Issue #6363 - Fixed malformed xml in GFSLAMPGridded.xml, changed ClgHgt to CigHgt in serverConfig.py and GFSLAMPGrid.py smart init; fixes #6363
...
Change-Id: Ibee986bdef73cdb6883fdd50e725d28d3838c848
Former-commit-id: 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff
2015-02-06 16:06:37 -05:00
Fay.Liang
fa2ec69693
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 85751935d73a6c64fd041c791ddb09f081831e20
2015-02-04 16:20:31 -05:00
Joshua Watson
af60ca1232
VLab Issue #5238 - changed parmsGFSLAMPGrid to GFSLAMPGridPARMS. Changed serverConfig.Vis to Vis on that same line; fixes #5238
...
Change-Id: I1724074899bad140a60c7f4da37622178ddba3c0
Former-commit-id: b32bdbe92d1db52997c9e79ece82df19f91357f3
2015-02-03 17:43:17 -05:00
Fay.Liang
07c742044d
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 8f839ec64da04492e6cf109fdf47b95f08db5388
2015-02-03 16:04:56 -05:00
Steve Harris
db185ed16c
Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
...
14.4.1-6
Former-commit-id: 6873606777f0c7c18928b0b0814050742c256dc2
2015-02-03 11:24:39 -06:00
Fay.Liang
4ddd4cec81
Merge branch 'master_14.3.1' into master_14.3.2
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/doConfig.py
Former-commit-id: 307e986b8e9ce89ad1eb7b28f88afe82c2596f30
2015-02-02 10:06:58 -05:00
Zhidong.Hao
caa2ebde5e
ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
...
Change-Id: I64fe04fb736e9dae2158d0dc1401af5795d2ddeb
Former-commit-id: 86cf0fa14af93c1bf35f57e566e19ad45fb34b34
2015-01-30 11:31:36 -05:00
Steve Harris
9927bac8ed
Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
...
14.4.1-5
Former-commit-id: 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021
2015-01-28 12:57:55 -06:00
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
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
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
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
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
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
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
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
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
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
Sarah Pontius
ff2a0aa1b1
VLab Issue #5674 - HLS/TCV Code Cleanup; fixes #5674
...
Change-Id: If31b2979fb741f0e258ae0e3a1323981826b3158
Former-commit-id: c044f5c349b27be19c6a3ea2abcc3c2294fc07a3
2014-12-15 09:54:17 -07:00
Ron Anderson
eaa74da50f
VLab Issue #4953 Added support for nwrwavestcv and sending TCV files to VTEC partners
...
Change-Id: I2af1f2eaf0625ea58153ebebc1ad10bb76da52bd
Former-commit-id: 18ab45bdae51ae9971a0c5f4b4bde7afe82074d4
2014-12-12 17:25:52 -06:00
Richard Peter
2457d0e6f7
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
Steve Harris
1203bcc18c
Merge tag 'OB_14.3.2-8m' into tcv_14.3.2
...
Former-commit-id: 4d97e95a23e55e064a654fda3d05901043158d7a
2014-12-11 10:43:57 -06:00
Joshua Watson
a8f5bb480b
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
...
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: cfce2a5f633a7312b9ad64dafb559c834b0ceddf
2014-12-11 11:39:00 -05:00
Sarah Pontius
1ed6581ceb
VLab Issue #5595 - HLS/TCV remaining task work and bug fix for 14.3.2 SwIT; fixes #5595
...
Change-Id: I872c55de264205ee60c369802075b32b5753fe5d
Former-commit-id: f7aeeb643ec6302e5af82838992f68ecf48ce702
2014-12-09 12:49:45 -07:00
Roger Ferrel
462e0d85c0
Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
...
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a
Former-commit-id: 46d3bbcc99d93845dcb159012b872fe746756b7c
2014-12-04 12:52:22 -06:00
