Commit graph

3599 commits

Author SHA1 Message Date
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: cd76675754 [formerly 61d335650b] [formerly cd76675754 [formerly 61d335650b] [formerly 4521a28536 [formerly 0580ad455973b3a176208203a140474df0040155]]]
Former-commit-id: 4521a28536
Former-commit-id: 5a0e7100d2 [formerly 61f4a5810e]
Former-commit-id: 21bd521d19
2015-02-24 15:36:40 -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: da2f15f749 [formerly 94a7507b9b] [formerly da2f15f749 [formerly 94a7507b9b] [formerly 47882c9ca1 [formerly d6d761a5170a91dbd6fed78af582bfc2a8f662a3]]]
Former-commit-id: 47882c9ca1
Former-commit-id: a54a056c67 [formerly 7ff67d57da]
Former-commit-id: ed78e2d716
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: 41ece8fea1 [formerly 00880112ba] [formerly 41ece8fea1 [formerly 00880112ba] [formerly d73e7e2d8b [formerly f43b83069eaf12e4190f1827eeed8d954239b164]]]
Former-commit-id: d73e7e2d8b
Former-commit-id: 31ee025ea6 [formerly e19974b779]
Former-commit-id: d558124cd4
2015-02-24 10:14:35 -06: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: 19a47ab731 [formerly 861a749706] [formerly 19a47ab731 [formerly 861a749706] [formerly 14ee6d9e50 [formerly 9242a49a1a688379c625ee93af21e98a007470b0]]]
Former-commit-id: 14ee6d9e50
Former-commit-id: 129151d1fb [formerly 7f6675f6b7]
Former-commit-id: a7894fbe7d
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: 61cd46e8b7 [formerly 13929d018d] [formerly 61cd46e8b7 [formerly 13929d018d] [formerly 83af3c98a8 [formerly 628dedd3b89dfc591fa21677b308d866fb62e593]]]
Former-commit-id: 83af3c98a8
Former-commit-id: 9245e7739b [formerly 8e342e28f3]
Former-commit-id: 3364d721bd
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: 98ead02564 [formerly 0e90c25595] [formerly 98ead02564 [formerly 0e90c25595] [formerly 1a7cde7f53 [formerly a5fc4d46bff38ecab9c9019c5184fae99a6ecc90]]]
Former-commit-id: 1a7cde7f53
Former-commit-id: 18779d0dbd [formerly fdcd836cd9]
Former-commit-id: 8061496043
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: f62ee78295 [formerly 4a0df1fc59] [formerly f62ee78295 [formerly 4a0df1fc59] [formerly c71994ea71 [formerly ec6e24420ad62fc306c577a0ec9e19c72d0d2bbe]]]
Former-commit-id: c71994ea71
Former-commit-id: a5f25dedeb [formerly ddf42cbde1]
Former-commit-id: 48fd5f0e93
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: 556e163629 [formerly ce6241f01a] [formerly 556e163629 [formerly ce6241f01a] [formerly 3877625b2f [formerly f747715fb7479dcaf0bfd0849ca4a96e8b99dad5]]]
Former-commit-id: 3877625b2f
Former-commit-id: a654404457 [formerly 73da7c1783]
Former-commit-id: 9c97956ff9
2015-02-20 20:04:56 +00:00
Ana Rivera
613232a4dc Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: I855933b8c46cd835ff872a098e74f36201cf6ecb

Former-commit-id: 9c17244d9c [formerly 90d3fcece6] [formerly 9c17244d9c [formerly 90d3fcece6] [formerly 62642d62bc [formerly 4df76b701f4a85fd0c55f0dd9fd351d1768bd92e]]]
Former-commit-id: 62642d62bc
Former-commit-id: e883e41912 [formerly a4938264a7]
Former-commit-id: 066f2a5ecb
2015-02-20 14:04:10 +00:00
Fay.Liang
65a626ca05 Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: c73879c8c4 [formerly 20231cb1f2] [formerly c73879c8c4 [formerly 20231cb1f2] [formerly 0072544dba [formerly 5dea200def84ed80d2bc38e37e1fe9bf3ac5b26c]]]
Former-commit-id: 0072544dba
Former-commit-id: f6e26717fd [formerly 0bd2ea9ff2]
Former-commit-id: 13327865c6
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: d7f5da46c3 [formerly 7e1d77fc7d] [formerly d7f5da46c3 [formerly 7e1d77fc7d] [formerly e958013148 [formerly b8a493859cf272d116cc05c6121c2c84791962d9]]]
Former-commit-id: e958013148
Former-commit-id: 816f9da0d8 [formerly 482c6c513a]
Former-commit-id: 7d42e954c0
2015-02-18 16:23:05 -05:00
David Friedman
73c8c03e9f ASM #17125 - Fix decoding of upper air collectives
Change-Id: I20e342561ce80460b2c1189277a45de539bc6540

Former-commit-id: 38bf119d23 [formerly 79fb68aeb1] [formerly 38bf119d23 [formerly 79fb68aeb1] [formerly ab8a709eb6 [formerly 420ca2787415f4f609fd6016ace1435f87b740f4]]]
Former-commit-id: ab8a709eb6
Former-commit-id: 28142ae3e0 [formerly c68555be0f]
Former-commit-id: bcd4b6c56f
2015-02-18 16:21:31 +00: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: 0d69148241 [formerly 40e08b3f99] [formerly 0d69148241 [formerly 40e08b3f99] [formerly 5af44f02e0 [formerly 49f4bfffc2197ab78eead4de677f1ab9e4bf37a2]]]
Former-commit-id: 5af44f02e0
Former-commit-id: c1d9a3693e [formerly f9cb790d0f]
Former-commit-id: e038f793e8
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: a2f42298b6 [formerly 76b6b292cb] [formerly a2f42298b6 [formerly 76b6b292cb] [formerly 94d705e210 [formerly 6f58cd962cc7995af01b96db1210e24b63429372]]]
Former-commit-id: 94d705e210
Former-commit-id: ec3f4cc548 [formerly b9311a0c35]
Former-commit-id: a13e186a09
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: c95baa3c40 [formerly 8cdd180b0a] [formerly c95baa3c40 [formerly 8cdd180b0a] [formerly af8b95bb97 [formerly fd4e0b9ada38ab93586088948809279e39a0374c]]]
Former-commit-id: af8b95bb97
Former-commit-id: f18381db69 [formerly 8d5a9c2045]
Former-commit-id: 984091af0c
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: 84dff9abc0 [formerly 32c91172b4] [formerly 84dff9abc0 [formerly 32c91172b4] [formerly eefa05ada3 [formerly 480b6597331ebd2ce7d7835de6e21050abf18722]]]
Former-commit-id: eefa05ada3
Former-commit-id: f4106951e2 [formerly 2b261f9ef2]
Former-commit-id: 444b080629
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: b54c101e34 [formerly adc24b15b6] [formerly b54c101e34 [formerly adc24b15b6] [formerly 92d4e5b370 [formerly c08dc1a7d558fba175460ef8255fc3b7b1db5c71]]]
Former-commit-id: 92d4e5b370
Former-commit-id: 450bfe4dca [formerly fbdb149621]
Former-commit-id: 709c5ac369
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: 0d9e4dd69e [formerly 060a169904] [formerly 0d9e4dd69e [formerly 060a169904] [formerly 9c637bda0b [formerly 2c62f45654b0531349fef5e7523c67c94236ce1a]]]
Former-commit-id: 9c637bda0b
Former-commit-id: 89d1309974 [formerly 5ff97ae188]
Former-commit-id: b29bfba24b
2015-02-12 17:32:05 -05:00
Juliya Dynina
1959b0f855 Merge "ASM #17092 - Add cronOTRs.xml to radar NDM files" into asm_14.4.1
Former-commit-id: 92d2d08451 [formerly ea11991a31] [formerly 92d2d08451 [formerly ea11991a31] [formerly 39e3497493 [formerly 346fc7563a680155c286bcbbcdaea25ec12b30fc]]]
Former-commit-id: 39e3497493
Former-commit-id: 983ef5cfbc [formerly 02f0a44ab7]
Former-commit-id: 3fdbb2e68f
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: 461db8a395 [formerly 420132b396] [formerly 461db8a395 [formerly 420132b396] [formerly 6191c93a9c [formerly f6b3765fc1670db2b9ceef75be7422a07b2badcf]]]
Former-commit-id: 6191c93a9c
Former-commit-id: 726045354b [formerly d8b54a59cf]
Former-commit-id: 85de48c8bf
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: e76330fac0 [formerly 3fe3d35339] [formerly e76330fac0 [formerly 3fe3d35339] [formerly 9311e6f440 [formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]]]
Former-commit-id: 9311e6f440
Former-commit-id: 300e3e50fe [formerly 6a2d5ec16d]
Former-commit-id: 07475d998f
2015-02-11 15:53:38 -06: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: c28f2e9aed [formerly 0163ec2871] [formerly c28f2e9aed [formerly 0163ec2871] [formerly 9b0f630436 [formerly 2ca313195e2e610d4a198884f45dde37ebecfbc6]]]
Former-commit-id: 9b0f630436
Former-commit-id: 526bae6daf [formerly e33ed09969]
Former-commit-id: 8fe81f8959
2015-02-11 20:06:54 +00:00
Fay.Liang
d0084754e7 Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 5c320554c0 [formerly a2a4551eae] [formerly 5c320554c0 [formerly a2a4551eae] [formerly 7d18af7172 [formerly 0c3fe94f92b6f43d8ae7d506c5c84915500a803c]]]
Former-commit-id: 7d18af7172
Former-commit-id: e077b8be51 [formerly 1d52c90d4c]
Former-commit-id: 38d28f27fc
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: 6db744c3cc [formerly c6c9209f84] [formerly 6db744c3cc [formerly c6c9209f84] [formerly 562582f056 [formerly fc9eb096ce16005be0a80eff3b4728f279f75cf5]]]
Former-commit-id: 562582f056
Former-commit-id: 298a9cd43f [formerly 02c1658af2]
Former-commit-id: aa0746f502
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: 786721c6e8 [formerly 56627a9012] [formerly 786721c6e8 [formerly 56627a9012] [formerly f612e85eed [formerly c570ea9f982665f3cb560c665cea6357c11841ce]]]
Former-commit-id: f612e85eed
Former-commit-id: 17587be0a5 [formerly 6ea886b4cf]
Former-commit-id: 607003fe11
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: 43b453b136 [formerly a2da3621ee] [formerly 43b453b136 [formerly a2da3621ee] [formerly 5ae6e8149e [formerly fa16cbd1cf7c92545d22b39c1bca597a0959c98c]]]
Former-commit-id: 5ae6e8149e
Former-commit-id: a7fe54d8e5 [formerly 62d5a51b81]
Former-commit-id: 41059afb7f
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: 4a58408889 [formerly ea046bedd3] [formerly 4a58408889 [formerly ea046bedd3] [formerly 9ffad49fa0 [formerly 20efa852dcc64c80890abed6b2882a205b37cf43]]]
Former-commit-id: 9ffad49fa0
Former-commit-id: 44fc2719c8 [formerly b490bf66ea]
Former-commit-id: 5d7f55047e
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: 9836b17e5e [formerly cecc02d5b1] [formerly 9836b17e5e [formerly cecc02d5b1] [formerly 796871f02f [formerly e4444751f61adccf1cb62adf0f6cb1abc4ab6384]]]
Former-commit-id: 796871f02f
Former-commit-id: ef3a3a7cf8 [formerly 2ad0f94f01]
Former-commit-id: c1292536f8
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: 631d700cf9 [formerly bdb0e3aacb] [formerly 631d700cf9 [formerly bdb0e3aacb] [formerly c2f02ff4b2 [formerly c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265]]]
Former-commit-id: c2f02ff4b2
Former-commit-id: e6ea29b193 [formerly 0bab05a20b]
Former-commit-id: 3eb45fd8e1
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: e3107ce1e4 [formerly 59f3f87190] [formerly e3107ce1e4 [formerly 59f3f87190] [formerly 43c7161dcf [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]]
Former-commit-id: 43c7161dcf
Former-commit-id: 149102ec85 [formerly 0b98fc8be6]
Former-commit-id: 2d5858f8f0
2015-02-09 17:19:41 -05: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: cb6420914f [formerly 05c119663f] [formerly cb6420914f [formerly 05c119663f] [formerly f6cf02c893 [formerly 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff]]]
Former-commit-id: f6cf02c893
Former-commit-id: 7235e8444e [formerly 5a136bb86b]
Former-commit-id: 4827934718
2015-02-06 16:06:37 -05:00
Greg Armendariz
6a33eca154 Omaha #3299 - Modify RCM deploy script
Change-Id: I420acc08705ebc2f52cd52ab7954b4d8c16fef15

Former-commit-id: 61bd37895f [formerly 2a554c5498] [formerly 61bd37895f [formerly 2a554c5498] [formerly d3658d0f28 [formerly 97c6bded155fc58e59beecdb33016e5286e622c1]]]
Former-commit-id: d3658d0f28
Former-commit-id: 13bb984db1 [formerly 7a2ab677d1]
Former-commit-id: 9b7823cf31
2015-02-06 11:20:43 -06:00
David Friedman
dd091f8122 ASM #17066 - afoslookup entry for site KEY is missing
Change-Id: I8f2ac59c416a2a9f5f28fb72993c5947fb96c126

Former-commit-id: 7912200761 [formerly de9a5fd3b3] [formerly 7912200761 [formerly de9a5fd3b3] [formerly c1aec126c1 [formerly 49c3a36159f66eb35b70bb76f210b36b2c7140f9]]]
Former-commit-id: c1aec126c1
Former-commit-id: 90f1d96309 [formerly e4d93f33f0]
Former-commit-id: 11e900c200
2015-02-05 16:21:48 +00:00
Ana Rivera
c789373ed6 Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: Iadb5e401012d3f34ebd1332cfa872c91270d2c72

Former-commit-id: e36429dcbd [formerly 2d5a46ab0c] [formerly e36429dcbd [formerly 2d5a46ab0c] [formerly be625ca07e [formerly 2a505d2ebd87b1a2e8f05f6d304debf48be9971c]]]
Former-commit-id: be625ca07e
Former-commit-id: 4f82ba7d74 [formerly 020d5604b4]
Former-commit-id: 6b5e542330
2015-02-05 14:17:31 +00:00
Fay.Liang
80e592746a Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 81ebcaada8 [formerly 551e3dfac0] [formerly 81ebcaada8 [formerly 551e3dfac0] [formerly 649426f4b3 [formerly 999467410f61f1874d5cf1e599fca9ce83ae4f70]]]
Former-commit-id: 649426f4b3
Former-commit-id: ec3fcbafec [formerly 454c8be23a]
Former-commit-id: 16c15a10f4
2015-02-04 16:51:19 -05:00
Shawn.Hooper
910f220a38 ASM #15311 - Update pgadmin spec file to allow for postgresql version greater than or equal to 8.4.13-1 and customTargets.xml for EDEX to allow for flexible feature files.
Change-Id: I9cf47aff9c6fa874ffe3d2e8bbbba2871abacec2

Former-commit-id: f4cd41e2f6 [formerly a98b54a944] [formerly f4cd41e2f6 [formerly a98b54a944] [formerly 915ddd6964 [formerly f1383bbdbadc54f8f2a0384d319c70160464a3ac]]]
Former-commit-id: 915ddd6964
Former-commit-id: b8b4e192fb [formerly ebe39a11ae]
Former-commit-id: e1e9c02dcd
2015-02-04 16:47:26 -05:00
Fay.Liang
f774d94942 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 091ebb1da5 [formerly fa2ec69693] [formerly 091ebb1da5 [formerly fa2ec69693] [formerly 98fc313530 [formerly 85751935d73a6c64fd041c791ddb09f081831e20]]]
Former-commit-id: 98fc313530
Former-commit-id: 629506683a [formerly ff0f4b4a13]
Former-commit-id: 8e2e580624
2015-02-04 16:20:31 -05:00
David Friedman
6c7451a37d ASM #17009 - Add Guam to countyTypes.txt file to account for "no counties"
Change-Id: Ic8dc2519b1cfb35bf3a2e0d8d61c007e108429a8

Former-commit-id: 8a31830def [formerly beb5074ddd] [formerly 8a31830def [formerly beb5074ddd] [formerly d1b3f2a5f4 [formerly 61ee73806f184b0d4092b8474f18b3525d92a20b]]]
Former-commit-id: d1b3f2a5f4
Former-commit-id: bf3737595d [formerly d6d2b52b3a]
Former-commit-id: 455ac39e04
2015-02-04 19:56:47 +00:00
Steve Harris
d09bee3e06 Merge tag 'OB_14.4.1-7m' into omaha_14.4.1
14.4.1-7


Former-commit-id: 8f2af8e359 [formerly f428e16ebb] [formerly 8f2af8e359 [formerly f428e16ebb] [formerly 2468be4dd1 [formerly 88b43275725882327d4487733e3135489874de1f]]]
Former-commit-id: 2468be4dd1
Former-commit-id: 520023d6c2 [formerly 8a8e66a3e1]
Former-commit-id: 8513926d87
2015-02-03 17:18:57 -06:00
Joshua Watson
fef69b67e3 VLab Issue #5238 - changed parmsGFSLAMPGrid to GFSLAMPGridPARMS. Changed serverConfig.Vis to Vis on that same line; fixes #5238
Change-Id: I1724074899bad140a60c7f4da37622178ddba3c0

Former-commit-id: 931a18418d [formerly af60ca1232] [formerly 931a18418d [formerly af60ca1232] [formerly 4c574676d7 [formerly b32bdbe92d1db52997c9e79ece82df19f91357f3]]]
Former-commit-id: 4c574676d7
Former-commit-id: 641f08a259 [formerly 66a1965ce1]
Former-commit-id: 42753b59ab
2015-02-03 17:43:17 -05:00
Fay.Liang
267fb768d9 Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 3aa9f17455 [formerly 07c742044d] [formerly 3aa9f17455 [formerly 07c742044d] [formerly de502a310b [formerly 8f839ec64da04492e6cf109fdf47b95f08db5388]]]
Former-commit-id: de502a310b
Former-commit-id: f075116f65 [formerly 7517728c42]
Former-commit-id: a3c39c1a8d
2015-02-03 16:04:56 -05:00
Steve Harris
2a1c5cfc23 Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
14.4.1-6


Former-commit-id: 80dae4bc15 [formerly db185ed16c] [formerly 80dae4bc15 [formerly db185ed16c] [formerly b684848820 [formerly 6873606777f0c7c18928b0b0814050742c256dc2]]]
Former-commit-id: b684848820
Former-commit-id: b971724d20 [formerly 40f44c9e15]
Former-commit-id: 9ffe8b7084
2015-02-03 11:24:39 -06:00
Fay.Liang
7f3a53beaf Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 5550322f62 [formerly ae85ade54d] [formerly 5550322f62 [formerly ae85ade54d] [formerly f1c34884a5 [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]]]
Former-commit-id: f1c34884a5
Former-commit-id: 7ac4ff3f48 [formerly 82b3637598]
Former-commit-id: 37f830c123
2015-02-03 11:24:57 -05:00
Richard Peter
4593d63c34 Merge "Omaha #4031 Implement preferrred AFOS first letter." into omaha_14.4.1
Former-commit-id: a63c9099c8 [formerly 166bf912bd] [formerly a63c9099c8 [formerly 166bf912bd] [formerly a3a4c9b0b7 [formerly 28d8103fc3287f27edccc6187ca3df5d72726d97]]]
Former-commit-id: a3a4c9b0b7
Former-commit-id: f5b835a71c [formerly 8bd257fa31]
Former-commit-id: 87a5d55d91
2015-02-02 12:49:01 -06:00
Fay.Liang
614d6f9c9e Merge branch 'master_14.3.1' into master_14.3.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/doConfig.py

Former-commit-id: 99b1511120 [formerly 4ddd4cec81] [formerly 99b1511120 [formerly 4ddd4cec81] [formerly 15f28c0245 [formerly 307e986b8e9ce89ad1eb7b28f88afe82c2596f30]]]
Former-commit-id: 15f28c0245
Former-commit-id: 4d1427b012 [formerly 5b1b9cff50]
Former-commit-id: 92f0a1bfb1
2015-02-02 10:06:58 -05:00
Matthew Howard
5018506b64 Merge "ASM #17055 - fix activeTableChange logging" into asm_14.4.1
Former-commit-id: 9c2ab1517f [formerly a1c925be94] [formerly 9c2ab1517f [formerly a1c925be94] [formerly 5bdaf8cd94 [formerly e14672d6e2b075792600c4d4d709044049e21d04]]]
Former-commit-id: 5bdaf8cd94
Former-commit-id: 9937da77dc [formerly c8674ffa38]
Former-commit-id: e1385df42b
2015-01-30 14:29:49 -05:00
Ana Rivera
7cea67cfc6 Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5

Former-commit-id: ccd0a40621 [formerly ea92049aac] [formerly ccd0a40621 [formerly ea92049aac] [formerly 070f0136ec [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]]
Former-commit-id: 070f0136ec
Former-commit-id: e358377ca7 [formerly 1bbb9bad78]
Former-commit-id: 0715e923df
2015-01-30 19:29:29 +00:00
Roger Ferrel
101817c3df Omaha #4031 Implement preferrred AFOS first letter.
Change-Id: I1c011beaf078d08c79c02863ac8afd01c7318645

Former-commit-id: fca30b70f5 [formerly 28f435a27f] [formerly fca30b70f5 [formerly 28f435a27f] [formerly 61ab864445 [formerly 776989760fa936913006924efb1e84832ffec31f]]]
Former-commit-id: 61ab864445
Former-commit-id: f94ff0543f [formerly 522b08564d]
Former-commit-id: c88bb9e085
2015-01-30 13:01:01 -06:00
Rici.Yu
93c9041e3e ASM #17055 - fix activeTableChange logging
Change-Id: I863a43005685b5b73eb96d80f0ffa46d12ecfcbc

Former-commit-id: 2fd2028490 [formerly 969e5ca72b] [formerly 2fd2028490 [formerly 969e5ca72b] [formerly e9349a6701 [formerly 777729392f9cdbbcfe3bbdd7ac4c19c714dfb31a]]]
Former-commit-id: e9349a6701
Former-commit-id: c23113db5e [formerly 36bdc2befb]
Former-commit-id: 90e6e9656d
2015-01-30 13:19:40 -05:00
Zhidong.Hao
6481725b9c ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
Change-Id: I64fe04fb736e9dae2158d0dc1401af5795d2ddeb

Former-commit-id: 60fbbed390 [formerly caa2ebde5e] [formerly 60fbbed390 [formerly caa2ebde5e] [formerly 6ab746f74a [formerly 86cf0fa14af93c1bf35f57e566e19ad45fb34b34]]]
Former-commit-id: 6ab746f74a
Former-commit-id: b5bbb05074 [formerly 2842cb4eba]
Former-commit-id: e6a50c62c0
2015-01-30 11:31:36 -05:00