Fay.Liang
176ce2fe36
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: cd7667575461d335650bcd7667575461d335650b4521a285364521a285365a0e7100d261f4a5810e21bd521d19
2015-02-24 15:36:40 -05:00
Fay.Liang
1a618a383b
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 429e0abfd6ff74566cda429e0abfd6ff74566cda66dd6987a166dd6987a1255948188abd5c416c7c29fa1f12d1
2015-02-24 14:58:28 -05:00
Fay.Liang
cb60c82771
Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: da2f15f74994a7507b9bda2f15f74994a7507b9b47882c9ca147882c9ca1a54a056c677ff67d57daed78e2d716
2015-02-24 14:56:50 -05:00
Darrel Kingfield
fbf2c0047c
VLab Issue #6585 - MRMS Menu Activation for 14.4.1; fixes #6585
...
Former-commit-id: 41ece8fea100880112ba41ece8fea100880112bad73e7e2d8bd73e7e2d8b31ee025ea6e19974b779d558124cd4
2015-02-24 10:14:35 -06:00
David Friedman
ec882fc46e
ASM #14990 - Add pqact patterns for earthquake and tsunami products
...
Change-Id: Ied72bd5896a9e1939f4ddd9d68cb362067406d65
Former-commit-id: 12987b265acc2c3da32512987b265acc2c3da3251afdea35fb1afdea35fbf4a648489c5044b99d1a6de60a5ea3
2015-02-24 15:33:48 +00:00
Ana Rivera
022a246bdc
VLab Issue #6432 - EKDMOS: add entries for CONUS and AK in gribModels_NCEP-7.xml; fixes #6432
...
Change-Id: I3596da11343b453b2c9f48d4a3e271f19228197a
Former-commit-id: 19a47ab731861a74970619a47ab731861a74970614ee6d9e5014ee6d9e50129151d1fb7f6675f6b7a7894fbe7d
2015-02-23 21:21:25 +00:00
Ana Rivera
83060e1703
Merge "VLab Issue #6554 Removed dependency on org.apache.commons.logging; fixes #6554 " into field_14.4.1
...
Former-commit-id: 61cd46e8b713929d018d61cd46e8b713929d018d83af3c98a883af3c98a89245e7739b8e342e28f33364d721bd
2015-02-23 20:56:31 +00:00
Ana Rivera
64d67b4b8a
VLab Issue #6432 - EKDMOS: update grib.xml; rename GribModel:7:14:114; fixes #6432
...
Change-Id: Ie2041a6e46cf421fc5ecafce49836007847855ac
Former-commit-id: 98ead025640e90c2559598ead025640e90c255951a7cde7f531a7cde7f5318779d0dbdfdcd836cd98061496043
2015-02-23 15:56:58 +00:00
Jason Burks
b8cf3a4d75
VLab Issue #6554 Removed dependency on org.apache.commons.logging; fixes #6554
...
Change-Id: I9e11f605069ee8dab0c8efa0c77fe4702d95d18a
Former-commit-id: f62ee782954a0df1fc59f62ee782954a0df1fc59c71994ea71c71994ea71a5f25dedebddf42cbde148fd5f0e93
2015-02-20 23:31:11 +00:00
Ana Rivera
a581ee41b8
VLab Issue #6432 - Rename GribModel:7:14:114 as EKDMOS; fixes #6432
...
Change-Id: I9c750ee1970de2705abec0fb806babbcd32c512c
Former-commit-id: 556e163629ce6241f01a556e163629ce6241f01a3877625b2f3877625b2fa65440445773da7c17839c97956ff9
2015-02-20 20:04:56 +00:00
Fay.Liang
d270dd0e8c
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 5200072e271734fc095b5200072e271734fc095b1cc803376d1cc803376db777d0f3779f5f017800792260d04a
2015-02-20 10:28:07 -05:00
Ana Rivera
613232a4dc
Merge branch 'master_14.4.1' into field_14.4.1
...
Change-Id: I855933b8c46cd835ff872a098e74f36201cf6ecb
Former-commit-id: 9c17244d9c90d3fcece69c17244d9c90d3fcece662642d62bc62642d62bce883e41912a4938264a7066f2a5ecb
2015-02-20 14:04:10 +00:00
Shawn.Hooper
7d75dcb27f
Moved the CIMSS, gsd, and ncep directories to separate repos
...
Change-Id: I4caa5d7425129d8d5df6c721b23226558ab4e2b3
Former-commit-id: 3bb5371f913d169da1953bb5371f913d169da19522df67d70c22df67d70ceb87cbe16594af9fb2851d9ffed36d
2015-02-20 08:04:15 -05:00
Fay.Liang
65a626ca05
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: c73879c8c420231cb1f2c73879c8c420231cb1f20072544dba0072544dbaf6e26717fd0bd2ea9ff213327865c6
2015-02-19 13:12:16 -05:00
Joshua Watson
d5ce5e3ef5
VLab Issue #6495 - Fixed parameter abbrev in derived parameter CLGTN2hr.xml; fixes #6495
...
Change-Id: I48f5c7a8c73a156d578c801c90b57364d8f5af1e
Former-commit-id: d7f5da46c37e1d77fc7dd7f5da46c37e1d77fc7de958013148e958013148816f9da0d8482c6c513a7d42e954c0
2015-02-18 16:23:05 -05:00
Joshua Watson
ffeb125843
VLab Issue #6496 - Key in sfcGrid.xml changed from HI-MOSGuide to MOSGuide-HI; fixes #6496
...
Change-Id: I4571bb639d474a86df39b7ea3bde1a23bad8f37f
Former-commit-id: 2c4042f5d920dbdea3262c4042f5d920dbdea326a1a7877f92a1a7877f928347778ba06af80563efba500bb277
2015-02-18 16:17:16 -05:00
Jingtao Deng
73dbc66946
VLab Issue #6488 - DR17123 Hydro HPE bias_source field in HPERadarResult table needs NO BIAS for some products; fixes #6488
...
Change-Id: I8c33b5e39222c13d2d3c1143d17ba77a06f6f877
Former-commit-id: 812fc2dc49bc8875c276812fc2dc49bc8875c2765756c660b45756c660b4452cf666c9a5954a12a07c41fd4916
2015-02-18 13:53:36 -05:00
David Friedman
73c8c03e9f
ASM #17125 - Fix decoding of upper air collectives
...
Change-Id: I20e342561ce80460b2c1189277a45de539bc6540
Former-commit-id: 38bf119d2379fb68aeb138bf119d2379fb68aeb1ab8a709eb6ab8a709eb628142ae3e0c68555be0fbcd4b6c56f
2015-02-18 16:21:31 +00:00
Fay.Liang
d84ada842d
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 058bd4ae9ca534707534058bd4ae9ca53470753431dcfdc40231dcfdc40206750bbcdeb55148442de24545fbcc
2015-02-17 14:07:11 -05:00
Sean.Webb
8ea8be130a
ASM #17142 - Fixed nwps dir permissions
...
Change-id: Ibd843098cea02d3f1ea6b75d3e715d804c5c1e37
Former-commit-id: 62e125667f9d46bf24dc62e125667f9d46bf24dcedae59425bedae59425b9e1b6846d3c530e44a15c8445f320e
2015-02-17 12:29:55 -05:00
Fay.Liang
79fe24e56a
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 0d6914824140e08b3f990d6914824140e08b3f995af44f02e05af44f02e0c1d9a3693ef9cb790d0fe038f793e8
2015-02-17 10:50:41 -05:00
Ana Rivera
d62adba10e
Merge "VLab Issue #6412 - Fixed the problem with ParameterLookup not being registered. As per Nate Jensen recommendation updated the spring configuration to depepnd-on getParameterHandlerRegistered. Also based on his recommendation removed parts from constructor and added them to the decode method that get singleton references for paramlookup and variable dictionary lookup. fixes #6412 " into field_14.4.1
...
Former-commit-id: a2f42298b676b6b292cba2f42298b676b6b292cb94d705e21094d705e210ec3f4cc548b9311a0c35a13e186a09
2015-02-13 19:51:48 +00:00
Fay.Liang
2546eeb607
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_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
Former-commit-id: c95baa3c408cdd180b0ac95baa3c408cdd180b0aaf8b95bb97af8b95bb97f18381db698d5a9c2045984091af0c
2015-02-13 09:34:24 -05:00
Fay.Liang
cf869f38ce
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 84dff9abc032c91172b484dff9abc032c91172b4eefa05ada3eefa05ada3f4106951e22b261f9ef2444b080629
2015-02-13 09:32:40 -05:00
Fay.Liang
13b425347f
Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: b54c101e34adc24b15b6b54c101e34adc24b15b692d4e5b37092d4e5b370450bfe4dcafbdb149621709c5ac369
2015-02-13 09:29:20 -05:00
Shawn.Hooper
19cdb600ed
ASM #15083 - Updates to allow nwps to be released in the gfesuite-server rpm
...
Change-Id: I9ab3fca601120954ebe229d3a4f0871b7b43af28
Former-commit-id: 0d9e4dd69e060a1699040d9e4dd69e060a1699049c637bda0b9c637bda0b89d13099745ff97ae188b29bfba24b
2015-02-12 17:32:05 -05:00
David Lovely
d6913e3259
Omaha #3300 Fixing merge errors in PointPrecipPlotResource
...
Change-Id: I6c5b8f0f2e590b0cf0440c1885435c2bf5649df4
Former-commit-id: 260a81877856c3135aef260a81877856c3135aef25f32b4c7025f32b4c70d282d70d60ca031107637322783d3f
2015-02-12 09:16:30 -06:00
Juliya Dynina
1959b0f855
Merge "ASM #17092 - Add cronOTRs.xml to radar NDM files" into asm_14.4.1
...
Former-commit-id: 92d2d08451ea11991a3192d2d08451ea11991a3139e349749339e3497493983ef5cfbc02f0a44ab73fdbb2e68f
2015-02-12 09:20:27 -05:00
Ana Rivera
cb4300775b
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: 461db8a395420132b396461db8a395420132b3966191c93a9c6191c93a9c726045354bd8b54a59cf85de48c8bf
2015-02-11 22:00:40 +00:00
Steve Harris
f2f6d56366
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
...
14.4.1-10
Former-commit-id: e76330fac03fe3d35339e76330fac03fe3d353399311e6f4409311e6f440300e3e50fe6a2d5ec16d07475d998f
2015-02-11 15:53:38 -06:00
Fay.Liang
dd338a5111
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 4f75f6d15e5ed7f626384f75f6d15e5ed7f62638eef951faeaeef951faeacea66a5addc8538cded1788f327e6a
2015-02-11 15:36:25 -05:00
Fay.Liang
9f124dc2e5
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 8d4bab98d530859f6ee68d4bab98d530859f6ee61208dbde061208dbde06c8b9377e8410c325518c9f2f5af448
2015-02-11 15:36:05 -05:00
Jason Burks
b521b1d445
VLab Issue #6412 - Fixed the problem with ParameterLookup not being registered. As per Nate Jensen recommendation updated the spring configuration to depepnd-on getParameterHandlerRegistered.
...
Also based on his recommendation removed parts from constructor and added them to the decode method that get singleton references for paramlookup and variable dictionary lookup. fixes #6412
Change-Id: Ie3554842b9f029dd62ff73f5edc928bc03e012e4
Former-commit-id: c28f2e9aed0163ec2871c28f2e9aed0163ec28719b0f6304369b0f630436526bae6dafe33ed099698fe81f8959
2015-02-11 20:06:54 +00:00
Shawn.Hooper
89ab24bc32
ASM #14246 - Check-in updated transmit_rfc_qpe script
...
Change-Id: I26751d39d2b31a345276da722c7a25a9ff8f9508
Former-commit-id: a6a840f3c80ba143cc43a6a840f3c80ba143cc433c3b69809d3c3b69809d91cbf5e2da41ebbc98d497de46bbb8
2015-02-11 13:55:20 -05:00
Shawn.Hooper
0b748e6638
ASM #16804 - Check in the required library files
...
Change-Id: Ib84d554ef4723072f8272327b7d00a737ba1405a
Former-commit-id: 8351eb7bdf6573bd26728351eb7bdf6573bd2672ca8b043aedca8b043aed065df6c8d61dc0ff9b6d0b183167df
2015-02-11 12:40:33 -05:00
Steve Harris
2139ef4dbf
Omaha #4111 - Updated foss licenses and Master_Rights_File.pdf
...
Former-commit-id: 3f8008fc9f62d29fefb43f8008fc9f62d29fefb4a5da551a5da5da551a5d5f4b78fd53dc372b03d8002c2ab43f
2015-02-11 10:58:07 -06:00
Fay.Liang
d0084754e7
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 5c320554c0a2a4551eae5c320554c0a2a4551eae7d18af71727d18af7172e077b8be511d52c90d4c38d28f27fc
2015-02-11 10:45:04 -05:00
David Friedman
db8a119ca1
ASM #17092 - Add cronOTRs.xml to radar NDM files
...
Change-Id: I46bf0728607737509ad97f6d2ed1803b3b10eeff
Former-commit-id: 6db744c3ccc6c9209f846db744c3ccc6c9209f84562582f056562582f056298a9cd43f02c1658af2aa0746f502
2015-02-11 15:10:34 +00:00
Joshua Watson
672e2deebe
VLab Issue #6421 - Source in GFSLAMPGrid.py smart init changed to GFSLAMPGrid. Visibility calculation streamlined; fixes #6421
...
Change-Id: Ic63cb16c30aff1705d9753017a43ba9c59b02d51
Former-commit-id: 786721c6e856627a9012786721c6e856627a9012f612e85eedf612e85eed17587be0a56ea886b4cf607003fe11
2015-02-11 09:04:44 -05:00
Juliya Dynina
3384329b96
Merge "ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer." into asm_14.4.1
...
Former-commit-id: 43b453b136a2da3621ee43b453b136a2da3621ee5ae6e8149e5ae6e8149ea7fe54d8e562d5a51b8141059afb7f
2015-02-10 15:45:27 -05:00
Michael Gamazaychikov
5fa796f77e
ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer.
...
Change-Id: Ib5c6bb89c57022b61260adbaa08760e5df05ad61
Former-commit-id: 4a58408889ea046bedd34a58408889ea046bedd39ffad49fa09ffad49fa044fc2719c8b490bf66ea5d7f55047e
2015-02-10 15:21:32 -05:00
Michael Gamazaychikov
bc0fde99b2
ASM #17103 - New dx3/4 hardware can drive EDEX OoM.
...
Change-Id: I0e466f39b50661cc0909158611aab2f7fdda06ba
Former-commit-id: 9836b17e5ececc02d5b19836b17e5ececc02d5b1796871f02f796871f02fef3a3a7cf82ad0f94f01c1292536f8
2015-02-10 10:35:32 -05:00
Ana Rivera
7585c6e288
Merge branch 'omaha_14.4.1' into field_14.4.1
...
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f
Former-commit-id: 631d700cf9bdb0e3aacb631d700cf9bdb0e3aacbc2f02ff4b2c2f02ff4b2e6ea29b1930bab05a20b3eb45fd8e1
2015-02-10 14:41:19 +00:00
Fay.Liang
31607db1e1
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: e3107ce1e459f3f87190e3107ce1e459f3f8719043c7161dcf43c7161dcf149102ec850b98fc8be62d5858f8f0
2015-02-09 17:19:41 -05:00
Greg Armendariz
e753638fcb
Omaha #3299 - Update buid.xml to work with nightly build and development workstation
...
Former-commit-id: c8d4fb79ddca6440c80ec8d4fb79ddca6440c80e5685c69da35685c69da33db1e793702161f229e204bcd53329
2015-02-09 14:57:22 -06:00
Greg Armendariz
97cc17408b
Merge "Omaha #3299 - Fix collaboration RPM build issue" into omaha_14.4.1
...
Former-commit-id: a1ee80064140e2f812cca1ee80064140e2f812cc3b596f12d83b596f12d8a2cd0b98799d07126719573b3d77db
2015-02-09 10:09:20 -06:00
Nate Jensen
431a1a0ed8
Merge "Omaha #3299 - Modify RCM deploy script" into omaha_14.4.1
...
Former-commit-id: 66c3ef37ca35295b401c66c3ef37ca35295b401c2bd03ecec02bd03ecec0a8ae15a20c771ff3f4c8da95c68b42
2015-02-09 09:19:45 -06:00
Joshua Watson
fa057c8063
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: cb6420914f05c119663fcb6420914f05c119663ff6cf02c893f6cf02c8937235e8444e5a136bb86b4827934718
2015-02-06 16:06:37 -05:00
Greg Armendariz
2f8b5d32eb
Omaha #3299 - Fix collaboration RPM build issue
...
Former-commit-id: 6fed5e21e7b88c8da1646fed5e21e7b88c8da164af72fd3775af72fd3775d27e4b416e483ed63a573463c00928
2015-02-06 11:37:47 -06:00
Greg Armendariz
6a33eca154
Omaha #3299 - Modify RCM deploy script
...
Change-Id: I420acc08705ebc2f52cd52ab7954b4d8c16fef15
Former-commit-id: 61bd37895f2a554c549861bd37895f2a554c5498d3658d0f28d3658d0f2813bb984db17a2ab677d19b7823cf31
2015-02-06 11:20:43 -06:00
