Steve Harris
|
3a10442f6e
|
Merge branch 'master_14.3.1' (14.3.1-14) into omaha_14.3.1
Former-commit-id: 7a8cdaea54 [formerly f158314a854a081cb12cd15cab3f6340d5c0fb78]
Former-commit-id: 941efaf857
|
2014-08-04 16:04:11 -05:00 |
|
Brian.Dyke
|
301f3094be
|
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: 270d2b0ddb [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]
Former-commit-id: 9abb02ea8a
|
2014-08-04 13:10:13 -04:00 |
|
Brian.Dyke
|
eeca2f2ec8
|
Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: 905728d2fb [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]
Former-commit-id: 3598f7b549
|
2014-07-31 09:56:21 -04:00 |
|
Ben Steffensmeier
|
1005d4d4b1
|
Issue #3455 Fix gridless grib models.
Former-commit-id: 12f84a9427 [formerly 1228b73957fc4a407e9075292faffeff3a84bdb4]
Former-commit-id: 7341c62f40
|
2014-07-30 16:44:07 -05:00 |
|
Shawn.Hooper
|
27f50397aa
|
ASM #15627 Revert "ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products."
This reverts commit e24dd6958e [formerly ba4c386f30] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]].
Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2
Former-commit-id: 4e322737ce [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]
Former-commit-id: 976c7b2d4a
|
2014-07-30 14:03:51 -04:00 |
|
Kiran.Shrestha
|
e9a417f5f8
|
ASM #97 - Freezing Level Height AGL for all models has units of dam instead of feet
Change-Id: Ib92fbb1c153a8a4739371d8148673a5e32ea36f9
Former-commit-id: 11bab40785 [formerly 1730a6dea78cfd922b59c6cccc1c6f44d3a56949]
Former-commit-id: a044b44c8b
|
2014-07-28 16:18:39 -04:00 |
|
Michael Gamazaychikov
|
e24dd6958e
|
ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products.
Change-Id: Ic5689db7714be086d6e4543602db33a07e5b2fc1
Former-commit-id: 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]
Former-commit-id: ba4c386f30
|
2014-07-28 15:12:10 -04:00 |
|
Rici.Yu
|
a75c0c2f15
|
ASM #15655 - Negate raising exception for empty db from IFPDB()
Change-Id: I5c96d654f3080a4b0f10113648f290a0d09961cb
Former-commit-id: 661737fb39 [formerly 9af51efbef229984de09a5ad338885d54f720270]
Former-commit-id: 9a1310d1ac
|
2014-07-28 11:30:49 -04:00 |
|
Brian.Dyke
|
cd099c0902
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 3d6c40b341 [formerly 69c55eff70bbfb445bdd9bf708ed5e4df896b42a]
Former-commit-id: cef9771fe1
|
2014-07-24 09:03:57 -04:00 |
|
Jonathan Sanchez
|
997485dd22
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: b991838494 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]
Former-commit-id: 86a8ca4a30
|
2014-07-22 15:32:12 -05:00 |
|
Shawn.Hooper
|
a70786ff22
|
ASM #15630 - Check-in fix for GFE: Missing ISC Wind Grids on behalf of Ron Anderson
Change-Id: I9053182b6c02d6c77e10e23b017b94bcff4da58b
Former-commit-id: ae272328a3 [formerly 4bca3ffd258a6869150154e93abb652a1f22bc4d]
Former-commit-id: 2a32d5945c
|
2014-07-22 15:59:22 -04:00 |
|
Steve Harris
|
7b0b043c67
|
Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 8a7ea92c2b [formerly c0033681d38af55bff79efbceec119606fcc5c2f]
Former-commit-id: bce7039508
|
2014-07-22 10:26:33 -05:00 |
|
Shawn Hooper
|
be7b6c166f
|
Merge "Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"" into asm_14.2.2
Former-commit-id: 1e2324481b [formerly 553333f8542d272d5412d9a8b1804e096c8031ff]
Former-commit-id: 1a57a9adea
|
2014-07-22 10:19:27 -05:00 |
|
Shawn Hooper
|
faf934a05a
|
Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"
This reverts commit 212fcd9eb4 [formerly a5791db7cb] [formerly 8de6be5219 [formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]].
Change-Id: Ib5d03f81b35c0371e063a89739b823b8264c439f
Former-commit-id: 65802e34fd [formerly 7dcfb55353ba7ec9d0619737da37781b0b186e5d]
Former-commit-id: 425bcea65d
|
2014-07-22 10:15:46 -05:00 |
|
Brian.Dyke
|
1fdf03034a
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 6811770438 [formerly 184da085244822b37575bf90e7f798c2abb842e9]
Former-commit-id: 6c121acf63
|
2014-07-22 07:08:34 -04:00 |
|
Ron Anderson
|
7903a20dbc
|
Issue #3415 Fixed d2dGridDataPurged to not purge NetCDF databases.
Change-Id: Ie52a5b8c46d58cb39acde27f0ebdde0c42fdfa67
Former-commit-id: 6ea726136b [formerly a2362b68b103c9013d615815924514ebe44be147]
Former-commit-id: f3a6393b96
|
2014-07-21 12:47:12 -05:00 |
|
Fay.Liang
|
212fcd9eb4
|
ASM #15630 -- GFE: Missing ISC Wind Grids
Change-Id: I289f1fafac8e034faa38dcddf639d5744fabe901
Former-commit-id: 8de6be5219 [formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]
Former-commit-id: a5791db7cb
|
2014-07-21 12:57:21 -04:00 |
|
Brian.Dyke
|
9ef7783251
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: c26e0cd548 [formerly 499b825592fdbdf150c918e5f3abacc4f37ddd70]
Former-commit-id: e55b892fc3
|
2014-07-21 11:18:25 -04:00 |
|
Fay.Liang
|
7cbd90018e
|
ASM #15468 Shefdecode failed to ingest RVF product at OUN
Change-Id: I6238c25f867c0e6e491831e9c2b1c47e22484620
Former-commit-id: a00be8447d [formerly 3637d6387396f88811ec3964bd61d10ce0ee38eb]
Former-commit-id: 87d50e7296
|
2014-07-15 10:22:09 -04:00 |
|
Richard Peter
|
148bbebd42
|
Issue #3146 Fix alert viz log statement.
Change-Id: Id55d73a77b7f408e02ea6fe6d528650839e535d0
Former-commit-id: 216d3ba749 [formerly deef73c921f9ba90b3db0f5793355f05ae861ffa]
Former-commit-id: e484749e1c
|
2014-07-14 17:01:53 -05:00 |
|
Nate Jensen
|
801ed7154f
|
Issue #3372 make LocalizationStreamHandler thread safe
Change-Id: I208b66fbd2b0bfcd225c3df98f96bcdcf5cb9a88
Former-commit-id: aaa0ed7ed7 [formerly 87d5faa03ea63759a6805ed063174fb09ca4800a]
Former-commit-id: 47bf21d7b5
|
2014-07-14 09:18:16 -05:00 |
|
Fay.Liang
|
34465f09ce
|
ASM #15468 Shefdecode failed to ingest RVF product at OUN
Change-Id: Ie345c88c4a3a0ff995c4d33772f90e863bed7ee5
Former-commit-id: 65677246c2 [formerly f78783d2ea194539414294abff46d4f2acda65d1]
Former-commit-id: 400561ac9c
|
2014-07-11 15:19:08 -04:00 |
|
Juliya Dynina
|
b9cd9042dd
|
Merge "ASM #15557 - Restore ability to display HPCGuide2.5" into asm_14.2.2
Former-commit-id: 8d967f1ecf [formerly 9826716e2a5f59826e8a3789ca8d2d8f8dc58cce]
Former-commit-id: ac39f9cb43
|
2014-07-11 08:37:30 -05:00 |
|
Mike Duff
|
c8bfcd54a3
|
Issue #3370 - Revert "Issue #3370 - Fix for mulitple shef types in same file."
This reverts commit e3b7a99388 [formerly b5b61650d3] [formerly 30655cf2ca [formerly 0c0b14929f74f2262559a4919171623870139313]].
Former-commit-id: 73c75303a8 [formerly 43cbf77bb90ba12a6ee11bc35b18c226f9490a88]
Former-commit-id: a35529bba4
|
2014-07-10 16:01:56 -05:00 |
|
Melissa Porricel
|
1e5bef6820
|
ASM #15557 - Restore ability to display HPCGuide2.5
Change-Id: Ibdcdd0aa95e406b5cd886dc8f51e74a3cde54d17
Change-Id: I5594c2151026247d48e657a30c7b4f94b14f036f
Former-commit-id: 1f7cf4a165 [formerly 5998e7ad9690e3b87805c75dcb711d299e8f1427]
Former-commit-id: d3c29b834d
|
2014-07-10 16:15:12 -04:00 |
|
Mike Duff
|
e3b7a99388
|
Issue #3370 - Fix for mulitple shef types in same file.
Change-Id: I23110d7887b68ff073afdf61815d7dced9c4a3ad
Former-commit-id: 30655cf2ca [formerly 0c0b14929f74f2262559a4919171623870139313]
Former-commit-id: b5b61650d3
|
2014-07-10 10:05:05 -05:00 |
|
Ron Anderson
|
9f4e89347a
|
Issue #3146 Added check for duplicate smartInit.
Added alertViz message for GFE site activation failure
Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004
Former-commit-id: 468668e19b [formerly eafc406ec75d5e1a1bbc93bb0b472a053922eb3a]
Former-commit-id: 0c0739bd72
|
2014-07-09 16:42:43 -05:00 |
|
David Friedman
|
8784501bba
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: db8977e281 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]
Former-commit-id: a45fe1dad0
|
2014-07-03 13:58:24 +00:00 |
|
Brian.Dyke
|
0fc76ff807
|
Merge branch 'm1413_m1422_merge' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2 CM-MERGE:14.1.3-4 into 14.2.2
Former-commit-id: 658cf3dd56 [formerly 142e61e538fb094633933e5a2e1244441fc0106b]
Former-commit-id: d56843d0e8
|
2014-07-02 13:18:10 -04:00 |
|
Steve Harris
|
4882158177
|
Merge branch 'master_14.1.3' into master_14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.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
Former-commit-id: fcecd75dfd [formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]
Former-commit-id: 483a69c58d
|
2014-07-01 18:05:43 -05:00 |
|
Steve Harris
|
f68e051938
|
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: 30cdbff7f8 [formerly 382c772c196711d230395f34a04559c188880622]
Former-commit-id: 1c8dc56d49
|
2014-07-01 13:38:18 -05:00 |
|
Ron Anderson
|
c7a74ab5b1
|
Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)
Former-commit-id: 4123073c4e [formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]
Former-commit-id: 2c5f910f90
|
2014-07-01 13:56:41 -04:00 |
|
Ron Anderson
|
9818d9b485
|
Omaha #3296 Added performance logging. Moved backup and purging to separate java thread. Cached PythonScript.
Change-Id: I9814345b512674269f17f4bf61bd615f0a50b059
(cherry picked from commit a11bcadd76eb9f9597e23ee609fd9cb364ad26ac)
Former-commit-id: 487c7ee30a [formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]
Former-commit-id: beee08c32b
|
2014-07-01 13:56:05 -04:00 |
|
Steve Harris
|
2f2958df37
|
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: 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]
Former-commit-id: d4dc1723c1
|
2014-07-01 11:08:46 -04:00 |
|
Mike Duff
|
1d3aeb881b
|
Issue #3321 - Fix ingest switch checks
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12
Former-commit-id: d62c925baa [formerly 5df0ac7f96d1280c1c50f39982693f9503b56f14]
Former-commit-id: f17c93bb19
|
2014-06-26 16:23:02 -05:00 |
|
Ron Anderson
|
5dd7a035ac
|
Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9
Former-commit-id: a6956a8ccd [formerly 04805a8957ef14754225f85f4722d8302cde8df3]
Former-commit-id: ead09dd683
|
2014-06-25 19:12:51 +00:00 |
|
Ron Anderson
|
f76a2d3700
|
Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46
Former-commit-id: 2ac9cd84ec [formerly 2a84ea1af7bb767e9e85387de1fd90c662f9f91d]
Former-commit-id: 898b30fadb
|
2014-06-25 13:21:32 -05:00 |
|
Steve Harris
|
3f2058a1ab
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: ddc6f2092a [formerly 174fe6d66525229f328846a1f4564300d7603c10]
Former-commit-id: 89606076ec
|
2014-06-24 10:57:56 -05:00 |
|
Nate Jensen
|
333f8317bb
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit 4558fe5862 [formerly 845483346f] [formerly 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]])
Former-commit-id: 65619399a0 [formerly f0ad63d2ccf347e92274701f9890e120b9e70140]
Former-commit-id: ca27873204
|
2014-06-23 11:59:26 -05:00 |
|
Steve Harris
|
16f5ff0979
|
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: 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]
Former-commit-id: b84dda5930
|
2014-06-20 14:01:55 -04:00 |
|
Nate Jensen
|
4558fe5862
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
Former-commit-id: 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]
Former-commit-id: 845483346f
|
2014-06-19 10:02:34 -05:00 |
|
Brian.Dyke
|
be589ceb9b
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]
Former-commit-id: 399c06820a
|
2014-06-18 08:55:49 -04:00 |
|
Steve Harris
|
0c3dcb77d5
|
Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
Former-commit-id: 6c82cc5c3d [formerly 4041e8afbb4bf1c0c416624140d74d27e963f9c8]
Former-commit-id: 1d2b8aeb7b
|
2014-06-16 07:49:58 -05:00 |
|
Brian.Dyke
|
5064d24e26
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]
Former-commit-id: 346bf852cd
|
2014-06-13 13:21:19 -04:00 |
|
Brian.Dyke
|
e802508e98
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 6fcc2604e0 [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]
Former-commit-id: a011c0b6bb
|
2014-06-12 07:07:17 -04:00 |
|
Steve Harris
|
3a3277c469
|
Merge branch 'master_14.2.2' (14.2.2-13) into omaha_14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: If5dae78936eddf1bc4ee63f35beb96a0cb9defb9
Former-commit-id: 9510608b74 [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]
Former-commit-id: ad6e9fa5ee
|
2014-06-11 12:55:44 -05:00 |
|
Ana Rivera
|
4b515bfd0a
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Former-commit-id: 9da58db461 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]
Former-commit-id: 65e90953c2
|
2014-06-11 17:35:55 +00:00 |
|
Ben Steffensmeier
|
1f270a6059
|
Issue #2661 Fix vector derived parameter.
Former-commit-id: 0a66c47341 [formerly 238043b8c4286e398176d4d6c78e585e33faa5da]
Former-commit-id: cd60dc028a
|
2014-06-10 15:44:33 -05:00 |
|
Brian.Dyke
|
0f07e14bf1
|
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: 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]
Former-commit-id: f72380ad60
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
ef5c74dece
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]
Former-commit-id: c1b3f9d180
|
2014-06-10 12:52:59 -04:00 |
|