Richard Peter
|
6fe6ecc60f
|
Issue #3534 Update ThreadBasedAppender to extend UnsychronizedAppenderBase.
Change-Id: I6b01acd59f7fde5e98dcfe1f1221f8725fc0540b
Former-commit-id: 4cebb22560 [formerly ce238544d1] [formerly 4cebb22560 [formerly ce238544d1] [formerly a9af2314d3 [formerly 31e9cb1cfc15d79b204d4d16c1f7afa614bb9ca2]]]
Former-commit-id: a9af2314d3
Former-commit-id: a1abde3669 [formerly 7c74a4110e]
Former-commit-id: 0119aea767
|
2014-08-22 10:47:05 -05:00 |
|
Roger Ferrel
|
d4db0fc5fd
|
Issue #3439 Name change per suggestions in email.
Former-commit-id: d76722987e [formerly fb54b80ed5] [formerly d76722987e [formerly fb54b80ed5] [formerly f110ca1f3d [formerly 44c3b86c9dc0b978acc66c5f79255270ce0acb41]]]
Former-commit-id: f110ca1f3d
Former-commit-id: 09f4d1b53b [formerly 9adb8c5d35]
Former-commit-id: 4d0c25e71d
|
2014-08-19 16:41:06 -05:00 |
|
Roger Ferrel
|
89363c1216
|
Issue #3439 Changes to add new GFS data to Product and Volume Browser.
Change-Id: I6314cb1a99aada35290a52e03810d4d51b224a9d
Former-commit-id: 2223d9500e [formerly eef17da8cd] [formerly 2223d9500e [formerly eef17da8cd] [formerly 518ec99c00 [formerly 658976d6c9485a3abe4d8a5ba759897407ec1239]]]
Former-commit-id: 518ec99c00
Former-commit-id: 07d04569ec [formerly 9e84fd27a4]
Former-commit-id: b00dcca9c4
|
2014-08-13 14:40:13 -05:00 |
|
Steve Harris
|
c1c551dc0b
|
Merge branch 'master_14.3.1' (14.3.1-14) into omaha_14.3.1
Former-commit-id: 3a10442f6e [formerly 941efaf857] [formerly 3a10442f6e [formerly 941efaf857] [formerly 7a8cdaea54 [formerly f158314a854a081cb12cd15cab3f6340d5c0fb78]]]
Former-commit-id: 7a8cdaea54
Former-commit-id: e875a9ded5 [formerly 1cdfc11ce4]
Former-commit-id: 038cd986eb
|
2014-08-04 16:04:11 -05:00 |
|
Brian.Dyke
|
803ceadaec
|
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: 301f3094be [formerly 9abb02ea8a] [formerly 301f3094be [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: bbe6ec4d50 [formerly 37aacfcb96]
Former-commit-id: b9daa26f7d
|
2014-08-04 13:10:13 -04:00 |
|
Brian.Dyke
|
29bc56c37f
|
Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: eeca2f2ec8 [formerly 3598f7b549] [formerly eeca2f2ec8 [formerly 3598f7b549] [formerly 905728d2fb [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]]]
Former-commit-id: 905728d2fb
Former-commit-id: 370b180653 [formerly e3745633a3]
Former-commit-id: f5030dfeb5
|
2014-07-31 09:56:21 -04:00 |
|
Ben Steffensmeier
|
fe12b1d419
|
Issue #3455 Fix gridless grib models.
Former-commit-id: 1005d4d4b1 [formerly 7341c62f40] [formerly 1005d4d4b1 [formerly 7341c62f40] [formerly 12f84a9427 [formerly 1228b73957fc4a407e9075292faffeff3a84bdb4]]]
Former-commit-id: 12f84a9427
Former-commit-id: dd7791eb00 [formerly 5c437a4be9]
Former-commit-id: 06f70271f5
|
2014-07-30 16:44:07 -05:00 |
|
Shawn.Hooper
|
53daf4e3bc
|
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 9732ea69398c323fee2b61570bfc18ab595da709 [formerly 8cffe955a9] [formerly e24dd6958e [formerly ba4c386f30] [formerly e24dd6958e [formerly ba4c386f30] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]].
Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2
Former-commit-id: 27f50397aa [formerly 976c7b2d4a] [formerly 27f50397aa [formerly 976c7b2d4a] [formerly 4e322737ce [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]]]
Former-commit-id: 4e322737ce
Former-commit-id: af19d9f9c4 [formerly fe0fffe51b]
Former-commit-id: 17ac974932
|
2014-07-30 14:03:51 -04:00 |
|
Kiran.Shrestha
|
fa984fd8a4
|
ASM #97 - Freezing Level Height AGL for all models has units of dam instead of feet
Change-Id: Ib92fbb1c153a8a4739371d8148673a5e32ea36f9
Former-commit-id: e9a417f5f8 [formerly a044b44c8b] [formerly e9a417f5f8 [formerly a044b44c8b] [formerly 11bab40785 [formerly 1730a6dea78cfd922b59c6cccc1c6f44d3a56949]]]
Former-commit-id: 11bab40785
Former-commit-id: fe32fc419a [formerly d32c2739cf]
Former-commit-id: 2c2ad03ee5
|
2014-07-28 16:18:39 -04:00 |
|
Michael Gamazaychikov
|
cc3172ead3
|
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: e24dd6958e [formerly ba4c386f30] [formerly e24dd6958e [formerly ba4c386f30] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]
Former-commit-id: 8cffe955a9
Former-commit-id: f186b49e92 [formerly bb7b43be49]
Former-commit-id: 134b1286fc
|
2014-07-28 15:12:10 -04:00 |
|
Rici.Yu
|
53691c3cd3
|
ASM #15655 - Negate raising exception for empty db from IFPDB()
Change-Id: I5c96d654f3080a4b0f10113648f290a0d09961cb
Former-commit-id: a75c0c2f15 [formerly 9a1310d1ac] [formerly a75c0c2f15 [formerly 9a1310d1ac] [formerly 661737fb39 [formerly 9af51efbef229984de09a5ad338885d54f720270]]]
Former-commit-id: 661737fb39
Former-commit-id: bacd423e0e [formerly 60116edbcc]
Former-commit-id: af5d129375
|
2014-07-28 11:30:49 -04:00 |
|
Brian.Dyke
|
3b1020701c
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: cd099c0902 [formerly cef9771fe1] [formerly cd099c0902 [formerly cef9771fe1] [formerly 3d6c40b341 [formerly 69c55eff70bbfb445bdd9bf708ed5e4df896b42a]]]
Former-commit-id: 3d6c40b341
Former-commit-id: 3f9cbad089 [formerly 5eebb40e76]
Former-commit-id: a6ac0d4696
|
2014-07-24 09:03:57 -04:00 |
|
Jonathan Sanchez
|
e4268f814e
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: 997485dd22 [formerly 86a8ca4a30] [formerly 997485dd22 [formerly 86a8ca4a30] [formerly b991838494 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]]
Former-commit-id: b991838494
Former-commit-id: f7bc9a8023 [formerly 025c29acc0]
Former-commit-id: 56cbd23141
|
2014-07-22 15:32:12 -05:00 |
|
Shawn.Hooper
|
df3b41ed7d
|
ASM #15630 - Check-in fix for GFE: Missing ISC Wind Grids on behalf of Ron Anderson
Change-Id: I9053182b6c02d6c77e10e23b017b94bcff4da58b
Former-commit-id: a70786ff22 [formerly 2a32d5945c] [formerly a70786ff22 [formerly 2a32d5945c] [formerly ae272328a3 [formerly 4bca3ffd258a6869150154e93abb652a1f22bc4d]]]
Former-commit-id: ae272328a3
Former-commit-id: 4171066d84 [formerly 94e01820a2]
Former-commit-id: 141996f0ab
|
2014-07-22 15:59:22 -04:00 |
|
Steve Harris
|
3b5fc91579
|
Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 7b0b043c67 [formerly bce7039508] [formerly 7b0b043c67 [formerly bce7039508] [formerly 8a7ea92c2b [formerly c0033681d38af55bff79efbceec119606fcc5c2f]]]
Former-commit-id: 8a7ea92c2b
Former-commit-id: 7a4111b29f [formerly 0314663e95]
Former-commit-id: e24b5a2fec
|
2014-07-22 10:26:33 -05:00 |
|
Shawn Hooper
|
41da5c063e
|
Merge "Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"" into asm_14.2.2
Former-commit-id: be7b6c166f [formerly 1a57a9adea] [formerly be7b6c166f [formerly 1a57a9adea] [formerly 1e2324481b [formerly 553333f8542d272d5412d9a8b1804e096c8031ff]]]
Former-commit-id: 1e2324481b
Former-commit-id: be27a13d1d [formerly e26c9dd7d1]
Former-commit-id: 01c315ff5d
|
2014-07-22 10:19:27 -05:00 |
|
Shawn Hooper
|
17d864604d
|
Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"
This reverts commit a31a408a18846806e64c2450d665b6ce6ed8ea82 [formerly 8de6be5219] [formerly 212fcd9eb4 [formerly a5791db7cb] [formerly 212fcd9eb4 [formerly a5791db7cb] [formerly 8de6be5219 [formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]]]].
Change-Id: Ib5d03f81b35c0371e063a89739b823b8264c439f
Former-commit-id: faf934a05a [formerly 425bcea65d] [formerly faf934a05a [formerly 425bcea65d] [formerly 65802e34fd [formerly 7dcfb55353ba7ec9d0619737da37781b0b186e5d]]]
Former-commit-id: 65802e34fd
Former-commit-id: e44a911ccc [formerly e53566cda2]
Former-commit-id: 44cfa3d6d3
|
2014-07-22 10:15:46 -05:00 |
|
Brian.Dyke
|
1c1998b1ec
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 1fdf03034a [formerly 6c121acf63] [formerly 1fdf03034a [formerly 6c121acf63] [formerly 6811770438 [formerly 184da085244822b37575bf90e7f798c2abb842e9]]]
Former-commit-id: 6811770438
Former-commit-id: 6b4232cd1d [formerly da8ab1327f]
Former-commit-id: 605e929b45
|
2014-07-22 07:08:34 -04:00 |
|
Ron Anderson
|
a9382653cb
|
Issue #3415 Fixed d2dGridDataPurged to not purge NetCDF databases.
Change-Id: Ie52a5b8c46d58cb39acde27f0ebdde0c42fdfa67
Former-commit-id: 7903a20dbc [formerly f3a6393b96] [formerly 7903a20dbc [formerly f3a6393b96] [formerly 6ea726136b [formerly a2362b68b103c9013d615815924514ebe44be147]]]
Former-commit-id: 6ea726136b
Former-commit-id: 07dd567f60 [formerly b79ebd0508]
Former-commit-id: e1b7339a39
|
2014-07-21 12:47:12 -05:00 |
|
Fay.Liang
|
5a51ceabac
|
ASM #15630 -- GFE: Missing ISC Wind Grids
Change-Id: I289f1fafac8e034faa38dcddf639d5744fabe901
Former-commit-id: 212fcd9eb4 [formerly a5791db7cb] [formerly 212fcd9eb4 [formerly a5791db7cb] [formerly 8de6be5219 [formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]]]
Former-commit-id: 8de6be5219
Former-commit-id: 14d7b5b41a [formerly bf4d91c7db]
Former-commit-id: 30a4b6218b
|
2014-07-21 12:57:21 -04:00 |
|
Brian.Dyke
|
b77d938e42
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 9ef7783251 [formerly e55b892fc3] [formerly 9ef7783251 [formerly e55b892fc3] [formerly c26e0cd548 [formerly 499b825592fdbdf150c918e5f3abacc4f37ddd70]]]
Former-commit-id: c26e0cd548
Former-commit-id: efff77a72c [formerly a3618e103e]
Former-commit-id: 3e66c55f09
|
2014-07-21 11:18:25 -04:00 |
|
Fay.Liang
|
ba05a236a7
|
ASM #15468 Shefdecode failed to ingest RVF product at OUN
Change-Id: I6238c25f867c0e6e491831e9c2b1c47e22484620
Former-commit-id: 7cbd90018e [formerly 87d50e7296] [formerly 7cbd90018e [formerly 87d50e7296] [formerly a00be8447d [formerly 3637d6387396f88811ec3964bd61d10ce0ee38eb]]]
Former-commit-id: a00be8447d
Former-commit-id: cc238af632 [formerly e69a6fe6f5]
Former-commit-id: 66a3732b4b
|
2014-07-15 10:22:09 -04:00 |
|
Richard Peter
|
d5ea4c44bd
|
Issue #3146 Fix alert viz log statement.
Change-Id: Id55d73a77b7f408e02ea6fe6d528650839e535d0
Former-commit-id: 148bbebd42 [formerly e484749e1c] [formerly 148bbebd42 [formerly e484749e1c] [formerly 216d3ba749 [formerly deef73c921f9ba90b3db0f5793355f05ae861ffa]]]
Former-commit-id: 216d3ba749
Former-commit-id: 1a861317f9 [formerly dbb440eeb4]
Former-commit-id: 5230703065
|
2014-07-14 17:01:53 -05:00 |
|
Nate Jensen
|
fa9cc74703
|
Issue #3372 make LocalizationStreamHandler thread safe
Change-Id: I208b66fbd2b0bfcd225c3df98f96bcdcf5cb9a88
Former-commit-id: 801ed7154f [formerly 47bf21d7b5] [formerly 801ed7154f [formerly 47bf21d7b5] [formerly aaa0ed7ed7 [formerly 87d5faa03ea63759a6805ed063174fb09ca4800a]]]
Former-commit-id: aaa0ed7ed7
Former-commit-id: e47111f601 [formerly eeba10c11d]
Former-commit-id: a802b19c29
|
2014-07-14 09:18:16 -05:00 |
|
Fay.Liang
|
3a4cff44cc
|
ASM #15468 Shefdecode failed to ingest RVF product at OUN
Change-Id: Ie345c88c4a3a0ff995c4d33772f90e863bed7ee5
Former-commit-id: 34465f09ce [formerly 400561ac9c] [formerly 34465f09ce [formerly 400561ac9c] [formerly 65677246c2 [formerly f78783d2ea194539414294abff46d4f2acda65d1]]]
Former-commit-id: 65677246c2
Former-commit-id: 475da269d8 [formerly 9285e0530f]
Former-commit-id: 60b7095e20
|
2014-07-11 15:19:08 -04:00 |
|
Juliya Dynina
|
dbed262c80
|
Merge "ASM #15557 - Restore ability to display HPCGuide2.5" into asm_14.2.2
Former-commit-id: b9cd9042dd [formerly ac39f9cb43] [formerly b9cd9042dd [formerly ac39f9cb43] [formerly 8d967f1ecf [formerly 9826716e2a5f59826e8a3789ca8d2d8f8dc58cce]]]
Former-commit-id: 8d967f1ecf
Former-commit-id: 15eef54b93 [formerly 6b490f5881]
Former-commit-id: 08098dfebd
|
2014-07-11 08:37:30 -05:00 |
|
Mike Duff
|
327f695d0c
|
Issue #3370 - Revert "Issue #3370 - Fix for mulitple shef types in same file."
This reverts commit 0d73c880f8b96034bf1f9b443aeb8dfcad2be382 [formerly 30655cf2ca] [formerly e3b7a99388 [formerly b5b61650d3] [formerly e3b7a99388 [formerly b5b61650d3] [formerly 30655cf2ca [formerly 0c0b14929f74f2262559a4919171623870139313]]]].
Former-commit-id: c8bfcd54a3 [formerly a35529bba4] [formerly c8bfcd54a3 [formerly a35529bba4] [formerly 73c75303a8 [formerly 43cbf77bb90ba12a6ee11bc35b18c226f9490a88]]]
Former-commit-id: 73c75303a8
Former-commit-id: 6b1031a927 [formerly 6f18256c56]
Former-commit-id: 08275089f5
|
2014-07-10 16:01:56 -05:00 |
|
Melissa Porricel
|
60bae53945
|
ASM #15557 - Restore ability to display HPCGuide2.5
Change-Id: Ibdcdd0aa95e406b5cd886dc8f51e74a3cde54d17
Change-Id: I5594c2151026247d48e657a30c7b4f94b14f036f
Former-commit-id: 1e5bef6820 [formerly d3c29b834d] [formerly 1e5bef6820 [formerly d3c29b834d] [formerly 1f7cf4a165 [formerly 5998e7ad9690e3b87805c75dcb711d299e8f1427]]]
Former-commit-id: 1f7cf4a165
Former-commit-id: c6a7e3bf85 [formerly 055dd5133f]
Former-commit-id: 408f192088
|
2014-07-10 16:15:12 -04:00 |
|
Mike Duff
|
918b247d79
|
Issue #3370 - Fix for mulitple shef types in same file.
Change-Id: I23110d7887b68ff073afdf61815d7dced9c4a3ad
Former-commit-id: e3b7a99388 [formerly b5b61650d3] [formerly e3b7a99388 [formerly b5b61650d3] [formerly 30655cf2ca [formerly 0c0b14929f74f2262559a4919171623870139313]]]
Former-commit-id: 30655cf2ca
Former-commit-id: 7a988c92fa [formerly 69fb1ccf35]
Former-commit-id: 2c0488534a
|
2014-07-10 10:05:05 -05:00 |
|
Ron Anderson
|
f7b8803180
|
Issue #3146 Added check for duplicate smartInit.
Added alertViz message for GFE site activation failure
Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004
Former-commit-id: 9f4e89347a [formerly 0c0739bd72] [formerly 9f4e89347a [formerly 0c0739bd72] [formerly 468668e19b [formerly eafc406ec75d5e1a1bbc93bb0b472a053922eb3a]]]
Former-commit-id: 468668e19b
Former-commit-id: ed7f6f731e [formerly a917ea16a4]
Former-commit-id: 7877809108
|
2014-07-09 16:42:43 -05:00 |
|
David Friedman
|
c44e9f88f6
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: 8784501bba [formerly a45fe1dad0] [formerly 8784501bba [formerly a45fe1dad0] [formerly db8977e281 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]]
Former-commit-id: db8977e281
Former-commit-id: 5270711c5d [formerly d36834080e]
Former-commit-id: 4f53bbd556
|
2014-07-03 13:58:24 +00:00 |
|
Brian.Dyke
|
71c5365af3
|
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: 0fc76ff807 [formerly d56843d0e8] [formerly 0fc76ff807 [formerly d56843d0e8] [formerly 658cf3dd56 [formerly 142e61e538fb094633933e5a2e1244441fc0106b]]]
Former-commit-id: 658cf3dd56
Former-commit-id: c75320efc4 [formerly 380b1d75de]
Former-commit-id: a94ec2062f
|
2014-07-02 13:18:10 -04:00 |
|
Steve Harris
|
984b7b1df4
|
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: 4882158177 [formerly 483a69c58d] [formerly 4882158177 [formerly 483a69c58d] [formerly fcecd75dfd [formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]]]
Former-commit-id: fcecd75dfd
Former-commit-id: c59b92895c [formerly 29c2cc0c29]
Former-commit-id: 998c9a4084
|
2014-07-01 18:05:43 -05:00 |
|
Steve Harris
|
15267970e4
|
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: f68e051938 [formerly 1c8dc56d49] [formerly f68e051938 [formerly 1c8dc56d49] [formerly 30cdbff7f8 [formerly 382c772c196711d230395f34a04559c188880622]]]
Former-commit-id: 30cdbff7f8
Former-commit-id: a4d91c59d6 [formerly 6f9129ac78]
Former-commit-id: d600ed9acf
|
2014-07-01 13:38:18 -05:00 |
|
Ron Anderson
|
ac6b3b0b10
|
Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)
Former-commit-id: c7a74ab5b1 [formerly 2c5f910f90] [formerly c7a74ab5b1 [formerly 2c5f910f90] [formerly 4123073c4e [formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]]]
Former-commit-id: 4123073c4e
Former-commit-id: 0329b4d8f4 [formerly 892eb70952]
Former-commit-id: bb91362572
|
2014-07-01 13:56:41 -04:00 |
|
Ron Anderson
|
2b33bfac7d
|
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: 9818d9b485 [formerly beee08c32b] [formerly 9818d9b485 [formerly beee08c32b] [formerly 487c7ee30a [formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]]]
Former-commit-id: 487c7ee30a
Former-commit-id: 699f2aa9bf [formerly c16fc8ee7f]
Former-commit-id: 8314f40ec3
|
2014-07-01 13:56:05 -04:00 |
|
Steve Harris
|
8fb747ad27
|
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: 2f2958df37 [formerly d4dc1723c1] [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 7fb4663d75 [formerly dcbab5621f]
Former-commit-id: 71357da9d2
|
2014-07-01 11:08:46 -04:00 |
|
Mike Duff
|
6163364939
|
Issue #3321 - Fix ingest switch checks
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12
Former-commit-id: 1d3aeb881b [formerly f17c93bb19] [formerly 1d3aeb881b [formerly f17c93bb19] [formerly d62c925baa [formerly 5df0ac7f96d1280c1c50f39982693f9503b56f14]]]
Former-commit-id: d62c925baa
Former-commit-id: 5078011147 [formerly d2cbeff06a]
Former-commit-id: 07dda3ecc1
|
2014-06-26 16:23:02 -05:00 |
|
Ron Anderson
|
b4a2ae3aae
|
Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9
Former-commit-id: 5dd7a035ac [formerly ead09dd683] [formerly 5dd7a035ac [formerly ead09dd683] [formerly a6956a8ccd [formerly 04805a8957ef14754225f85f4722d8302cde8df3]]]
Former-commit-id: a6956a8ccd
Former-commit-id: 8b027efdec [formerly 7abeff57cc]
Former-commit-id: e5b81ccee0
|
2014-06-25 19:12:51 +00:00 |
|
Ron Anderson
|
849625a3e1
|
Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46
Former-commit-id: f76a2d3700 [formerly 898b30fadb] [formerly f76a2d3700 [formerly 898b30fadb] [formerly 2ac9cd84ec [formerly 2a84ea1af7bb767e9e85387de1fd90c662f9f91d]]]
Former-commit-id: 2ac9cd84ec
Former-commit-id: ddcfe574d8 [formerly ff5c0f2c33]
Former-commit-id: 2cc92ecc69
|
2014-06-25 13:21:32 -05:00 |
|
Steve Harris
|
2841134c60
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 3f2058a1ab [formerly 89606076ec] [formerly 3f2058a1ab [formerly 89606076ec] [formerly ddc6f2092a [formerly 174fe6d66525229f328846a1f4564300d7603c10]]]
Former-commit-id: ddc6f2092a
Former-commit-id: 304d918a7c [formerly 1f033d22e6]
Former-commit-id: 323c240f59
|
2014-06-24 10:57:56 -05:00 |
|
Nate Jensen
|
e62629413d
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit e8d704968a2a87105489ad9cb51cd8aea78401aa [formerly 65eb76ff66] [formerly 4558fe5862 [formerly 845483346f] [formerly 4558fe5862 [formerly 845483346f] [formerly 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]]])
Former-commit-id: 333f8317bb [formerly ca27873204] [formerly 333f8317bb [formerly ca27873204] [formerly 65619399a0 [formerly f0ad63d2ccf347e92274701f9890e120b9e70140]]]
Former-commit-id: 65619399a0
Former-commit-id: 3add021413 [formerly f9fce25836]
Former-commit-id: e717dbfeb1
|
2014-06-23 11:59:26 -05:00 |
|
Steve Harris
|
196f53e609
|
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: 16f5ff0979 [formerly b84dda5930] [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]
Former-commit-id: 419c5f4aba
Former-commit-id: af06c5a890 [formerly 66d30e59a3]
Former-commit-id: 935542914d
|
2014-06-20 14:01:55 -04:00 |
|
Nate Jensen
|
55aa294dad
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
Former-commit-id: 4558fe5862 [formerly 845483346f] [formerly 4558fe5862 [formerly 845483346f] [formerly 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]]
Former-commit-id: 65eb76ff66
Former-commit-id: 0ea72ce3ed [formerly d1766dc991]
Former-commit-id: 0d1d12158d
|
2014-06-19 10:02:34 -05:00 |
|
Brian.Dyke
|
b602d29456
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: be589ceb9b [formerly 399c06820a] [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: e28febcf27 [formerly 9031f58d02]
Former-commit-id: 3e10995d87
|
2014-06-18 08:55:49 -04:00 |
|
Steve Harris
|
e0be1f390e
|
Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
Former-commit-id: 0c3dcb77d5 [formerly 1d2b8aeb7b] [formerly 0c3dcb77d5 [formerly 1d2b8aeb7b] [formerly 6c82cc5c3d [formerly 4041e8afbb4bf1c0c416624140d74d27e963f9c8]]]
Former-commit-id: 6c82cc5c3d
Former-commit-id: f2d30c4c62 [formerly 7a8741d8fa]
Former-commit-id: 61112bc258
|
2014-06-16 07:49:58 -05:00 |
|
Brian.Dyke
|
3da13f3d12
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 5064d24e26 [formerly 346bf852cd] [formerly 5064d24e26 [formerly 346bf852cd] [formerly 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]
Former-commit-id: 81832d97e5
Former-commit-id: 764b729546 [formerly 4bca0769fb]
Former-commit-id: 766974a05d
|
2014-06-13 13:21:19 -04:00 |
|
Brian.Dyke
|
40fb1f6159
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e802508e98 [formerly a011c0b6bb] [formerly e802508e98 [formerly a011c0b6bb] [formerly 6fcc2604e0 [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]]
Former-commit-id: 6fcc2604e0
Former-commit-id: 50073f34b2 [formerly 10696504a0]
Former-commit-id: ac235bf20a
|
2014-06-12 07:07:17 -04:00 |
|
Steve Harris
|
435da06069
|
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: 3a3277c469 [formerly ad6e9fa5ee] [formerly 3a3277c469 [formerly ad6e9fa5ee] [formerly 9510608b74 [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]]
Former-commit-id: 9510608b74
Former-commit-id: f78bc57920 [formerly 23dea36a2c]
Former-commit-id: 5a86a00518
|
2014-06-11 12:55:44 -05:00 |
|
Ana Rivera
|
eb270f539a
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Former-commit-id: 4b515bfd0a [formerly 65e90953c2] [formerly 4b515bfd0a [formerly 65e90953c2] [formerly 9da58db461 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]]]
Former-commit-id: 9da58db461
Former-commit-id: e249a71765 [formerly 540a286595]
Former-commit-id: 5721d2df05
|
2014-06-11 17:35:55 +00:00 |
|