Kenneth Sperow
|
386365e3cb
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 476c78a2d7 [formerly 189e3cc1f2] [formerly 476c78a2d7 [formerly 189e3cc1f2] [formerly 342398e6a3 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]]]
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f
Former-commit-id: 6f8b069dbe [formerly 8490f7ea33] [formerly 6f8b069dbe [formerly 8490f7ea33] [formerly 9fa9425aea [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]]
Former-commit-id: 9fa9425aea
Former-commit-id: 7302462544 [formerly 846395fd42]
Former-commit-id: 51b0b4e566
|
2014-05-22 14:16:49 -07:00 |
|
brian.dyke
|
b2e3c50ec0
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 9626317825 [formerly 011d121e4b] [formerly 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]
Former-commit-id: 58683ad040
Former-commit-id: 2e105c1d5d [formerly bc4649765a]
Former-commit-id: b42011fc76
|
2014-05-19 09:45:37 -04:00 |
|
Ana Rivera
|
94ceb3698f
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: 7e74e047a0 [formerly 91715e7a3f] [formerly 7e74e047a0 [formerly 91715e7a3f] [formerly 81a9d4fa44 [formerly e71ef5db23122405fc6aab71526a9cc3ec3ad823]]]
Former-commit-id: 81a9d4fa44
Former-commit-id: e33c6e2d69 [formerly 88520fc206]
Former-commit-id: 8cb1bfc3b8
|
2014-05-12 18:55:06 +00:00 |
|
Ana Rivera
|
d036ab76d7
|
VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b
Former-commit-id: e7fbea035f [formerly aac45623bc] [formerly e7fbea035f [formerly aac45623bc] [formerly 1b4450ec5f [formerly c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e]]]
Former-commit-id: 1b4450ec5f
Former-commit-id: ebd4358495 [formerly 6a4fb7f0a3]
Former-commit-id: c150a7c8e1
|
2014-05-08 20:10:24 +00:00 |
|
Melissa Porricel
|
9b7d84bfc4
|
ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca
Former-commit-id: a91a4ed137 [formerly 42c36a5e80] [formerly a91a4ed137 [formerly 42c36a5e80] [formerly 92231e051d [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]]]
Former-commit-id: 92231e051d
Former-commit-id: 6749967b5b [formerly 1e32d583b4]
Former-commit-id: 38539cc805
|
2014-05-05 14:56:58 -04:00 |
|
David Gillingham
|
83674f8444
|
Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb
Former-commit-id: c14497b1b7 [formerly 2426e463f7] [formerly c14497b1b7 [formerly 2426e463f7] [formerly 6ca193b8e9 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: 48bc49fd4b [formerly 2e8b8c6e86]
Former-commit-id: c0fd32360d
|
2014-04-25 10:56:43 -05:00 |
|
Richard Peter
|
a8f823447e
|
Merge branch 'omaha_13.5.3' (13.5.2-10) into development
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
Former-commit-id: cbf53120dd [formerly cd504e4e98] [formerly cbf53120dd [formerly cd504e4e98] [formerly 0787e7cc86 [formerly 1af6e051089c8f0a216307647e044d19d41f6828]]]
Former-commit-id: 0787e7cc86
Former-commit-id: 9896b051c1 [formerly 1a62020265]
Former-commit-id: 03a58dabb2
|
2013-10-15 11:36:12 -05:00 |
|
Steve Harris
|
2dc7de0754
|
13.5.2-9 baseline
Former-commit-id: fdbef0e663 [formerly a28a2d3041] [formerly fdbef0e663 [formerly a28a2d3041] [formerly f36cf09d21 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]
Former-commit-id: f36cf09d21
Former-commit-id: 7d0416293f [formerly 45c58e1cb3]
Former-commit-id: be3a804cf5
|
2013-10-10 10:55:20 -04:00 |
|
Ben Steffensmeier
|
8187fb1fa8
|
Issue #2390 update grib decoder and vb to handle new storm surge parameters.
Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209
Former-commit-id: 7f7aa20d0a [formerly 236b3fe05f] [formerly 7f7aa20d0a [formerly 236b3fe05f] [formerly 8f94e1434c [formerly 6de5f10b9abf900fc412f2b1e867ce339a15d41e]]]
Former-commit-id: 8f94e1434c
Former-commit-id: 69eec8d4c6 [formerly d4670d19b1]
Former-commit-id: 9a0a15ffd8
|
2013-10-03 16:30:13 -05:00 |
|
Steve Harris
|
609926f1f4
|
13.5.2-4 baseline
Former-commit-id: 595e7bc0d9 [formerly e3c935d48b] [formerly 595e7bc0d9 [formerly e3c935d48b] [formerly 58c6821427 [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]
Former-commit-id: 58c6821427
Former-commit-id: 4c6790f10f [formerly abed443b59]
Former-commit-id: e2398f74e5
|
2013-09-12 11:13:59 -04:00 |
|
Greg Armendariz
|
13ac0b1062
|
13.5.1-5 baseline
Former-commit-id: 82aabf1066 [formerly 492f92ef7b] [formerly 82aabf1066 [formerly 492f92ef7b] [formerly ea7ac37930 [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: d899faec3d [formerly 869922cb82]
Former-commit-id: dc881f4ed8
|
2013-07-03 12:20:27 -04:00 |
|
Steve Harris
|
2779f5c6d9
|
13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21 [formerly 47cc08ac79]
Former-commit-id: 547c1dedd1
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
f52ec0b0a0
|
13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
|
2013-01-06 14:32:24 -06:00 |
|