Commit graph

392 commits

Author SHA1 Message Date
Nate Jensen
64140e614a Omaha #3356 ensure LevelFactory is initialized on edex before GFE startup
Change-Id: I889b85404fc361dc92ae4323fb20ab44ff12a166

Former-commit-id: 0bde7e01fb [formerly 64f5c249ed837f854db743e1b90f2194c01cdbfd]
Former-commit-id: cbe3d885a2
2014-09-12 09:14:01 -05:00
Nate Jensen
f5ae895143 Omaha #3356 updates for improved level lookup
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: ae9cffaaea [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]
Former-commit-id: 62b84b2fb3
2014-09-09 15:38:53 -05:00
Steve Harris
d984dd538f Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]
Former-commit-id: 5d58625abc
2014-08-29 10:17:52 -05:00
Ron Anderson
0962c75d18 Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34

Former-commit-id: bb1e80b844 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]
Former-commit-id: 2b88ade974
2014-08-28 10:43:54 -05:00
Brian.Dyke
f7f16ff9eb Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]
Former-commit-id: aa83bf804f
2014-08-27 11:19:19 -04:00
Richard Peter
ef45928158 Omaha #3541 Fix request jvm startup and build
Change-Id: I6141ef1d74430fc43ea11f296c6ab95fc4276d6f

Former-commit-id: bf5f1c27a7 [formerly 1c698d67a2c0ed3b11f910b593b1bbbdb2f46a86]
Former-commit-id: f478b42e61
2014-08-25 21:21:04 -05:00
Ron Anderson
ff31c11e02 Omaha #1664 Fixed invalid thread access in several GFE dialogs
Change-Id: Ib40e6928c61a0f9e4f9fad9d8e7a06a66af292e3

Former-commit-id: 4178dac741 [formerly 93aa457f4918cd16edd21422819cda12af26250f]
Former-commit-id: bb124e7fa2
2014-08-21 09:25:14 -05:00
Ron Anderson
a41384e4d6 Issue #3526 Fix bug in WECache that caused ISC grids to be removed
Change-Id: I49feb0d093a75c83b9a09deeed15e81cf0ed967b

Former-commit-id: 62236ee92a [formerly edd1c5d77ec7a84b5807134d863d59147a846405]
Former-commit-id: 8c4cb3b4ae
2014-08-20 11:03:03 -05:00
Ana Rivera
b5e6172652 VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e

Conflicts:
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 9ada9356c5 [formerly 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2]
Former-commit-id: 4c585af933
2014-08-15 11:04:23 -05:00
Ana Rivera
eefe73ee51 VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: a44d5d91db [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]
Former-commit-id: 9bf2df23be
2014-08-15 11:02:36 -05:00
Ana Rivera
236a089297 VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml

Former-commit-id: a053fd5bad [formerly d95450f2eebc6b3d10093bd16736b349a1d0b12b]
Former-commit-id: 95451b2959
2014-08-15 11:01:23 -05:00
Steve Harris
46fe792d83 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py

Former-commit-id: 0fb743ec44 [formerly f7d474895366eb23ae5eef242a4568f911435aa3]
Former-commit-id: bf9a0fa5de
2014-08-04 22:20:29 -05:00
Brian.Dyke
37aacfcb96 Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]
Former-commit-id: 270d2b0ddb
2014-08-04 13:10:13 -04:00
Rici.Yu
60116edbcc ASM #15655 - Negate raising exception for empty db from IFPDB()
Change-Id: I5c96d654f3080a4b0f10113648f290a0d09961cb

Former-commit-id: 9a1310d1ac [formerly 9af51efbef229984de09a5ad338885d54f720270]
Former-commit-id: 661737fb39
2014-07-28 11:30:49 -04:00
Brian.Dyke
5eebb40e76 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: cef9771fe1 [formerly 69c55eff70bbfb445bdd9bf708ed5e4df896b42a]
Former-commit-id: 3d6c40b341
2014-07-24 09:03:57 -04:00
Shawn.Hooper
94e01820a2 ASM #15630 - Check-in fix for GFE: Missing ISC Wind Grids on behalf of Ron Anderson
Change-Id: I9053182b6c02d6c77e10e23b017b94bcff4da58b

Former-commit-id: 2a32d5945c [formerly 4bca3ffd258a6869150154e93abb652a1f22bc4d]
Former-commit-id: ae272328a3
2014-07-22 15:59:22 -04:00
Shawn Hooper
e53566cda2 Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"
This reverts commit a31a408a18846806e64c2450d665b6ce6ed8ea82 [formerly 8de6be5219] [formerly a5791db7cb [formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]].

Change-Id: Ib5d03f81b35c0371e063a89739b823b8264c439f

Former-commit-id: 425bcea65d [formerly 7dcfb55353ba7ec9d0619737da37781b0b186e5d]
Former-commit-id: 65802e34fd
2014-07-22 10:15:46 -05:00
Nate Jensen
9f7f79fbc5 Merge "Omaha #2768 removed workaround for edex localization notifications" into omaha_14.4.1
Former-commit-id: 4e94590075 [formerly 7f3040fd6aefbae1af344a3177bf2fd7f7ad48fb]
Former-commit-id: 3b23caee5d
2014-07-21 13:02:56 -05:00
Ron Anderson
b79ebd0508 Issue #3415 Fixed d2dGridDataPurged to not purge NetCDF databases.
Change-Id: Ie52a5b8c46d58cb39acde27f0ebdde0c42fdfa67

Former-commit-id: f3a6393b96 [formerly a2362b68b103c9013d615815924514ebe44be147]
Former-commit-id: 6ea726136b
2014-07-21 12:47:12 -05:00
Greg Armendariz
a6133db8d2 Merge branch 'omaha_15.1.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java

Former-commit-id: f12b1a1098 [formerly 111178b736cc4e894f59bc7127ec2bddda96264c]
Former-commit-id: 8773e17083
2014-07-21 12:12:32 -05:00
Fay.Liang
bf4d91c7db ASM #15630 -- GFE: Missing ISC Wind Grids
Change-Id: I289f1fafac8e034faa38dcddf639d5744fabe901

Former-commit-id: a5791db7cb [formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]
Former-commit-id: 8de6be5219
2014-07-21 12:57:21 -04:00
Brian Clements
c29be3e09e Omaha #2768 removed workaround for edex localization notifications
Change-Id: I34bc85f1d7331f2a6da8d14410836634f6239a17

Former-commit-id: 9693094664 [formerly c142ac8f463951ed58d68bed24fb966adc289c2b]
Former-commit-id: e5f5fb76cf
2014-07-21 09:53:34 -05:00
Greg Armendariz
fcf1b5ee8a Omaha #2914 - Remove calls to PropertiesFactory
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be

Former-commit-id: b34486973e [formerly b59ebac85404fba5657e9041b6f2be7a1959fd9c]
Former-commit-id: 09f6bd471c
2014-07-17 15:41:38 -05:00
Steve Harris
3eb889da68 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Former-commit-id: 6b19a1ccb5 [formerly 3dceeec9d010a590353f6ab3327743781cd014f1]
Former-commit-id: a5491e2d9f
2014-07-17 10:40:27 -05:00
Richard Peter
dbb440eeb4 Issue #3146 Fix alert viz log statement.
Change-Id: Id55d73a77b7f408e02ea6fe6d528650839e535d0

Former-commit-id: e484749e1c [formerly deef73c921f9ba90b3db0f5793355f05ae861ffa]
Former-commit-id: 216d3ba749
2014-07-14 17:01:53 -05:00
Steve Harris
202c1a0316 Merge branch 'omaha_14.4.1' into omaha_15.1.1
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java

Former-commit-id: 05de3fbe54 [formerly 6d1d1a86cfb70e9ca096f59d9aadf8219efdaeb3]
Former-commit-id: a43ffbe052
2014-07-14 12:08:09 -05:00
Steve Harris
51d4907b76 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 0cb8d202f5 [formerly f352b47e1d930bfe2bc46f956c781375881e41f9]
Former-commit-id: 4df5ae5a60
2014-07-14 11:54:53 -05:00
Ron Anderson
a917ea16a4 Issue #3146 Added check for duplicate smartInit.
Added alertViz message for GFE site activation failure

Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004

Former-commit-id: 0c0739bd72 [formerly eafc406ec75d5e1a1bbc93bb0b472a053922eb3a]
Former-commit-id: 468668e19b
2014-07-09 16:42:43 -05:00
Ron Anderson
87664d86a5 Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc

Former-commit-id: 8d50f9d15a [formerly 1e9e5abc477785c5b8cda9dd214da7de83532b9f]
Former-commit-id: 24faa48233
2014-07-07 09:02:14 -05:00
Richard Peter
a4beeb4d1b Omaha 3300 Fix merge issue in gfe-spring.xml
Change-Id: I575616e8d3176baad77db276e2c43b43801686ea

Former-commit-id: 40c01d05d4 [formerly 59bf1aba9614d3206eb5e3d02d985d726a5c9fbe]
Former-commit-id: eacaf068a7
2014-07-01 15:43:46 -05:00
Richard Peter
fc27824dbc Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	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/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py

Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61

Former-commit-id: 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]
Former-commit-id: 8ecc27f714
2014-07-01 15:34:39 -05:00
Steve Harris
dcbab5621f Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]
Former-commit-id: 7acd9ab2dd
2014-07-01 11:08:46 -04:00
Roger Ferrel
801bdc8fc7 Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df

Former-commit-id: bd2d40faee [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]
Former-commit-id: ad6eac6e20
2014-06-26 11:16:09 -05:00
Richard Peter
364c886659 Omaha #3277 Update smart init launcher to allow additional threads.
Change-Id: I118d905823bd8304f0e5ea2087a16d3d8ee075ce

Former-commit-id: 584b7576af [formerly 475cb088596a89e3bd2818196e2f2e250930a95c]
Former-commit-id: 8eb0b62db8
2014-06-26 10:27:33 -05:00
Ron Anderson
7abeff57cc Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9

Former-commit-id: ead09dd683 [formerly 04805a8957ef14754225f85f4722d8302cde8df3]
Former-commit-id: a6956a8ccd
2014-06-25 19:12:51 +00:00
Ron Anderson
ff5c0f2c33 Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46

Former-commit-id: 898b30fadb [formerly 2a84ea1af7bb767e9e85387de1fd90c662f9f91d]
Former-commit-id: 2ac9cd84ec
2014-06-25 13:21:32 -05:00
Nate Jensen
5062338b2d Omaha #3133 remove unnecessary register buddies
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: 9219e1e254 [formerly c91a7d4084be3753ad51afd11b46b621af0bc878]
Former-commit-id: 53633a6ed4
2014-06-23 14:13:19 -05:00
Steve Harris
66d30e59a3 CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java

Former-commit-id: b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]
Former-commit-id: 419c5f4aba
2014-06-20 14:01:55 -04:00
Brian.Dyke
9031f58d02 CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]
Former-commit-id: 8ecdd9a192
2014-06-18 08:55:49 -04:00
Steve Harris
362988b9d7 Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: 9213369739 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]
Former-commit-id: e1c8ad2611
2014-06-16 08:19:12 -05:00
Brian.Dyke
4bca0769fb CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 346bf852cd [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]
Former-commit-id: 81832d97e5
2014-06-13 13:21:19 -04:00
Ron Anderson
864cfd2c30 Omaha #3244 Improved GFE purge error handling
Change-Id: I18fcf443b6c77a323df76659a8a60cb10b65669c

Former-commit-id: 366e5d7fd3 [formerly d8955e6dcd8f16b33c54de104596e9743ce7d85e]
Former-commit-id: 9ac1f19455
2014-06-12 08:05:56 -05:00
Ana Rivera
540a286595 VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e

Former-commit-id: 65e90953c2 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]
Former-commit-id: 9da58db461
2014-06-11 17:35:55 +00:00
Brian.Dyke
49cd9574d9 Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]
Former-commit-id: 9ab17ddecb
2014-06-10 13:56:03 -04:00
Brian.Dyke
f568b5606a CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]
Former-commit-id: 8874d41872
2014-06-10 12:52:59 -04:00
Fay.Liang
39efc11cb3 ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7

Former-commit-id: d1aa160aa7 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]
Former-commit-id: c5e6daa943
2014-06-05 15:49:27 -04:00
Ron Anderson
3f4bdb7377 Omaha #3130 Fix thread safety issue in NetCDFFile.
Change-Id: I99999c827507a565e1980fe2b686cef4d848fe7d

Former-commit-id: 47bdee2a58 [formerly 36f4c0f9b339dc91577cb231e2804d83f4f52706]
Former-commit-id: 68a0c42242
2014-06-04 16:31:32 -05:00
Ron Anderson
d1f5016eb9 Omaha #3071 Fix one more possible NPE
Change-Id: I23c3f47d354a2a5ee4576a6040e2012b3b39dfe6

Former-commit-id: d772e2b49b [formerly 855c5410fc4bf2e33f6dcd560f0c8441199ad0ad]
Former-commit-id: fde392dcd1
2014-06-04 16:26:25 -05:00
Kenneth Sperow
ca913b6159 Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8

Former-commit-id: c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]
Former-commit-id: f2a738cc25
2014-06-03 20:55:29 -07:00
Ron Anderson
dec1fa7dd4 Omaha #3071 Fix error in IFPGridDatabase found in code review
Change-Id: I7bdab6085d49f0ed3667cc4d27dc58aae24d0bcf

Former-commit-id: cf44e1835a [formerly 97dd32f3ee5393e419ca7794eb2f564a4941494e]
Former-commit-id: 03b44f91d0
2014-06-03 14:15:51 -05:00