Commit graph

8187 commits

Author SHA1 Message Date
mjames-upc
c583aa07de move FFMP and WarnGen shapefiles outside of repo due to size
Former-commit-id: e55c1e9d09
2015-02-27 13:30:02 -07:00
mjames-upc
42cb5e3df9 build env increment and gitignore edits
Former-commit-id: 734d1f08b3
2015-02-27 13:05:30 -07:00
mjames-upc
8e1b5227b9 added WarnGen shapefile import to OAX localization RPM
Former-commit-id: deb546fb44
2015-02-27 12:30:13 -07:00
mjames-upc
5718b964d3 removed BOU and TBW localizations
Former-commit-id: ddaf8ed629
2015-02-27 12:20:04 -07:00
mjames-upc
a19abcb24e this gitignore of bin directories is stupid
Former-commit-id: 5168383cc4
2015-02-24 16:03:42 -07:00
mjames-upc
3830bd78e6 postgres dependency for netcdf, build updates and hydroapps localization change to BOU
Former-commit-id: 3ce0331400
2015-02-24 16:03:21 -07:00
mjames-upc
41512ba7b2 update EDEX manager to account for non-routable IP addresses, and change spec file dependency from deprecated PreReq to Requires
Former-commit-id: 752a938c57
2015-02-24 15:36:20 -07:00
Fay.Liang
67bb29ee85 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 4c8e279c0c [formerly cd76675754] [formerly 61d335650b] [formerly 4c8e279c0c [formerly cd76675754] [formerly 61d335650b] [formerly 4521a28536 [formerly 61d335650b [formerly 0580ad455973b3a176208203a140474df0040155]]]]
Former-commit-id: 4521a28536
Former-commit-id: 49ddb7f9d3 [formerly 5a0e7100d2] [formerly 83eb03c3d822b4d52bf420dd89d2c6d0c487c4fd [formerly 61f4a5810e]]
Former-commit-id: 415d8d2f2157757d24cf2c71c64663db30dee776 [formerly 21bd521d19]
Former-commit-id: 176ce2fe36
2015-02-24 15:36:40 -05:00
Fay.Liang
6460c0fed5 Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: f94af6d720 [formerly 429e0abfd6] [formerly ff74566cda] [formerly f94af6d720 [formerly 429e0abfd6] [formerly ff74566cda] [formerly 66dd6987a1 [formerly ff74566cda [formerly c1bcd2a0db42c30d447a54ed185fc33d875628b3]]]]
Former-commit-id: 66dd6987a1
Former-commit-id: bf0312855a [formerly 255948188a] [formerly b851b8b2a24de3c839b4cc769ceca23215f76591 [formerly bd5c416c7c]]
Former-commit-id: 09d64471d4d5a7394c410a319f432b1c6219af19 [formerly 29fa1f12d1]
Former-commit-id: 1a618a383b
2015-02-24 14:58:28 -05:00
Fay.Liang
aa23d1797c Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 6b09ea0d2f [formerly da2f15f749] [formerly 94a7507b9b] [formerly 6b09ea0d2f [formerly da2f15f749] [formerly 94a7507b9b] [formerly 47882c9ca1 [formerly 94a7507b9b [formerly d6d761a5170a91dbd6fed78af582bfc2a8f662a3]]]]
Former-commit-id: 47882c9ca1
Former-commit-id: 4075740437 [formerly a54a056c67] [formerly c0c98737dc4e3935da47a3c042681411232be7ca [formerly 7ff67d57da]]
Former-commit-id: 22c1cde65e749055463a9fbe0344c2ca55a9e05f [formerly ed78e2d716]
Former-commit-id: cb60c82771
2015-02-24 14:56:50 -05:00
Darrel Kingfield
52cb3becc5 VLab Issue #6585 - MRMS Menu Activation for 14.4.1; fixes #6585
Former-commit-id: 7d83a053fd [formerly 41ece8fea1] [formerly 00880112ba] [formerly 7d83a053fd [formerly 41ece8fea1] [formerly 00880112ba] [formerly d73e7e2d8b [formerly 00880112ba [formerly f43b83069eaf12e4190f1827eeed8d954239b164]]]]
Former-commit-id: d73e7e2d8b
Former-commit-id: 9e7ab4a1e9 [formerly 31ee025ea6] [formerly da43204f724bb40645e61f9b23ef361ef2b9a4f9 [formerly e19974b779]]
Former-commit-id: 6645f64cc7b7697601139f2428df86c8fe954820 [formerly d558124cd4]
Former-commit-id: fbf2c0047c
2015-02-24 10:14:35 -06:00
David Friedman
395ddd6d35 ASM #14990 - Add pqact patterns for earthquake and tsunami products
Change-Id: Ied72bd5896a9e1939f4ddd9d68cb362067406d65

Former-commit-id: 08d7e997f7 [formerly 12987b265a] [formerly cc2c3da325] [formerly 08d7e997f7 [formerly 12987b265a] [formerly cc2c3da325] [formerly 1afdea35fb [formerly cc2c3da325 [formerly 899c6472abfdcfa27018d20cc204735dea4d2f43]]]]
Former-commit-id: 1afdea35fb
Former-commit-id: 20f86e1e91 [formerly f4a648489c] [formerly 116fc7a47462a3d90501587c2fb81c84677c0ceb [formerly 5044b99d1a]]
Former-commit-id: 52402dcbbe8d413dae24a82fd2b5cfb8636daca0 [formerly 6de60a5ea3]
Former-commit-id: ec882fc46e
2015-02-24 15:33:48 +00:00
Ana Rivera
9d8e20a1eb VLab Issue #6432 - EKDMOS: add entries for CONUS and AK in gribModels_NCEP-7.xml; fixes #6432
Change-Id: I3596da11343b453b2c9f48d4a3e271f19228197a

Former-commit-id: 53827a030a [formerly 19a47ab731] [formerly 861a749706] [formerly 53827a030a [formerly 19a47ab731] [formerly 861a749706] [formerly 14ee6d9e50 [formerly 861a749706 [formerly 9242a49a1a688379c625ee93af21e98a007470b0]]]]
Former-commit-id: 14ee6d9e50
Former-commit-id: 8e50ec12e9 [formerly 129151d1fb] [formerly 29ac6a947c3291bb65ac0322483e1d2580a02ef8 [formerly 7f6675f6b7]]
Former-commit-id: 4c93283e1342fb8589d5471ab7bdb0e5d79077f9 [formerly a7894fbe7d]
Former-commit-id: 022a246bdc
2015-02-23 21:21:25 +00:00
Ana Rivera
92ecfa416c Merge "VLab Issue #6554 Removed dependency on org.apache.commons.logging; fixes #6554" into field_14.4.1
Former-commit-id: 9dc664d120 [formerly 61cd46e8b7] [formerly 13929d018d] [formerly 9dc664d120 [formerly 61cd46e8b7] [formerly 13929d018d] [formerly 83af3c98a8 [formerly 13929d018d [formerly 628dedd3b89dfc591fa21677b308d866fb62e593]]]]
Former-commit-id: 83af3c98a8
Former-commit-id: 9a21654015 [formerly 9245e7739b] [formerly 3e66a1da5f10ac5a5c3128a49b94a3652b80754f [formerly 8e342e28f3]]
Former-commit-id: 4cae945a6ac5ba664559098faa779985dcca90e1 [formerly 3364d721bd]
Former-commit-id: 83060e1703
2015-02-23 20:56:31 +00:00
Ana Rivera
0f298cfabb VLab Issue #6432 - EKDMOS: update grib.xml; rename GribModel:7:14:114; fixes #6432
Change-Id: Ie2041a6e46cf421fc5ecafce49836007847855ac

Former-commit-id: b9f9e5616d [formerly 98ead02564] [formerly 0e90c25595] [formerly b9f9e5616d [formerly 98ead02564] [formerly 0e90c25595] [formerly 1a7cde7f53 [formerly 0e90c25595 [formerly a5fc4d46bff38ecab9c9019c5184fae99a6ecc90]]]]
Former-commit-id: 1a7cde7f53
Former-commit-id: 6219ea5d10 [formerly 18779d0dbd] [formerly d5895084c5e5ce15bd1285754fc806c1df945111 [formerly fdcd836cd9]]
Former-commit-id: 07f2b8017f84f2202f685500ef7e59d3459202b8 [formerly 8061496043]
Former-commit-id: 64d67b4b8a
2015-02-23 15:56:58 +00:00
Jason Burks
8649d8b7bc VLab Issue #6554 Removed dependency on org.apache.commons.logging; fixes #6554
Change-Id: I9e11f605069ee8dab0c8efa0c77fe4702d95d18a

Former-commit-id: 3f3a88828b [formerly f62ee78295] [formerly 4a0df1fc59] [formerly 3f3a88828b [formerly f62ee78295] [formerly 4a0df1fc59] [formerly c71994ea71 [formerly 4a0df1fc59 [formerly ec6e24420ad62fc306c577a0ec9e19c72d0d2bbe]]]]
Former-commit-id: c71994ea71
Former-commit-id: 5279607b20 [formerly a5f25dedeb] [formerly b6aaea88743f2d7b8b9c9bade7e425632cd8a8a8 [formerly ddf42cbde1]]
Former-commit-id: d85543e88f27fa8057f0bdab5b27bc35ddc23cb0 [formerly 48fd5f0e93]
Former-commit-id: b8cf3a4d75
2015-02-20 23:31:11 +00:00
Ana Rivera
5e372f13f1 VLab Issue #6432 - Rename GribModel:7:14:114 as EKDMOS; fixes #6432
Change-Id: I9c750ee1970de2705abec0fb806babbcd32c512c

Former-commit-id: 7982aba305 [formerly 556e163629] [formerly ce6241f01a] [formerly 7982aba305 [formerly 556e163629] [formerly ce6241f01a] [formerly 3877625b2f [formerly ce6241f01a [formerly f747715fb7479dcaf0bfd0849ca4a96e8b99dad5]]]]
Former-commit-id: 3877625b2f
Former-commit-id: bb49ce57d2 [formerly a654404457] [formerly f30acb33563dc261b54ddfb788a6949fe73fff8e [formerly 73da7c1783]]
Former-commit-id: ff58b1e7a5cda5dd4b1edb8f668bf85ec1c2dc8c [formerly 9c97956ff9]
Former-commit-id: a581ee41b8
2015-02-20 20:04:56 +00:00
Fay.Liang
5558059ec1 Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 1fc9ba7700 [formerly 5200072e27] [formerly 1734fc095b] [formerly 1fc9ba7700 [formerly 5200072e27] [formerly 1734fc095b] [formerly 1cc803376d [formerly 1734fc095b [formerly a838f2895c4c22dc3c6404fb892dfbf9d36815fd]]]]
Former-commit-id: 1cc803376d
Former-commit-id: f712d0d8f9 [formerly b777d0f377] [formerly e43e0eba8dd4f00340e53cad8882869dfc0d6d80 [formerly 9f5f017800]]
Former-commit-id: 48f673fdbabe585bf81fb05c8e1bebd69cb1fc10 [formerly 792260d04a]
Former-commit-id: d270dd0e8c
2015-02-20 10:28:07 -05:00
Ana Rivera
5e34e5713b Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: I855933b8c46cd835ff872a098e74f36201cf6ecb

Former-commit-id: 38264269e3 [formerly 9c17244d9c] [formerly 90d3fcece6] [formerly 38264269e3 [formerly 9c17244d9c] [formerly 90d3fcece6] [formerly 62642d62bc [formerly 90d3fcece6 [formerly 4df76b701f4a85fd0c55f0dd9fd351d1768bd92e]]]]
Former-commit-id: 62642d62bc
Former-commit-id: c6b914f851 [formerly e883e41912] [formerly 2ca34e15733eb595427f59f3eab59f559da5a948 [formerly a4938264a7]]
Former-commit-id: 7f92d595854784d8289097b4433c9309483988a8 [formerly 066f2a5ecb]
Former-commit-id: 613232a4dc
2015-02-20 14:04:10 +00:00
Shawn.Hooper
6ce6669e54 Moved the CIMSS, gsd, and ncep directories to separate repos
Change-Id: I4caa5d7425129d8d5df6c721b23226558ab4e2b3

Former-commit-id: fdbe5ce2f8 [formerly 3bb5371f91] [formerly 3d169da195] [formerly fdbe5ce2f8 [formerly 3bb5371f91] [formerly 3d169da195] [formerly 22df67d70c [formerly 3d169da195 [formerly 5ed3823b82d5da57a3c1f1a7e4331911670acc28]]]]
Former-commit-id: 22df67d70c
Former-commit-id: 642aa2d498 [formerly eb87cbe165] [formerly 9a6b880d1827be7fba44fd3e086cd1f6284334de [formerly 94af9fb285]]
Former-commit-id: 18d82545034e778d1901b6c5535aa44e7f3bbf6e [formerly 1d9ffed36d]
Former-commit-id: 7d75dcb27f
2015-02-20 08:04:15 -05:00
Fay.Liang
10008435e8 Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: f1e6be9aaf [formerly c73879c8c4] [formerly 20231cb1f2] [formerly f1e6be9aaf [formerly c73879c8c4] [formerly 20231cb1f2] [formerly 0072544dba [formerly 20231cb1f2 [formerly 5dea200def84ed80d2bc38e37e1fe9bf3ac5b26c]]]]
Former-commit-id: 0072544dba
Former-commit-id: c7e57d8337 [formerly f6e26717fd] [formerly 5d34b327000aa6abe8120e41c9006140bd4466a7 [formerly 0bd2ea9ff2]]
Former-commit-id: 7f85d50cdc0a6d911ae9b1f794767d3b907f357f [formerly 13327865c6]
Former-commit-id: 65a626ca05
2015-02-19 13:12:16 -05:00
Joshua Watson
e3efd3ca66 VLab Issue #6495 - Fixed parameter abbrev in derived parameter CLGTN2hr.xml; fixes #6495
Change-Id: I48f5c7a8c73a156d578c801c90b57364d8f5af1e

Former-commit-id: 51e006c656 [formerly d7f5da46c3] [formerly 7e1d77fc7d] [formerly 51e006c656 [formerly d7f5da46c3] [formerly 7e1d77fc7d] [formerly e958013148 [formerly 7e1d77fc7d [formerly b8a493859cf272d116cc05c6121c2c84791962d9]]]]
Former-commit-id: e958013148
Former-commit-id: c1e3dbb927 [formerly 816f9da0d8] [formerly 2af7238a3b6dfa9a782a1f0507e5a9d0bf36ee8f [formerly 482c6c513a]]
Former-commit-id: 6bae621f918d1e568752e25d65835b34db37d00f [formerly 7d42e954c0]
Former-commit-id: d5ce5e3ef5
2015-02-18 16:23:05 -05:00
Joshua Watson
70c9dfcaed VLab Issue #6496 - Key in sfcGrid.xml changed from HI-MOSGuide to MOSGuide-HI; fixes #6496
Change-Id: I4571bb639d474a86df39b7ea3bde1a23bad8f37f

Former-commit-id: 66da4d33a7 [formerly 2c4042f5d9] [formerly 20dbdea326] [formerly 66da4d33a7 [formerly 2c4042f5d9] [formerly 20dbdea326] [formerly a1a7877f92 [formerly 20dbdea326 [formerly aa05e8a312511e61c0dd01680b536282ee733154]]]]
Former-commit-id: a1a7877f92
Former-commit-id: acba8b8bc9 [formerly 8347778ba0] [formerly ae55b20968a1cdd1d0a9bcad4c2b4a0fb3aca34c [formerly 6af80563ef]]
Former-commit-id: 288e83c3ab7e57c85e9b8c33ec7b78eecaa0d5a4 [formerly ba500bb277]
Former-commit-id: ffeb125843
2015-02-18 16:17:16 -05:00
Jingtao Deng
aa84b95b2f 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: 683b558d25 [formerly 812fc2dc49] [formerly bc8875c276] [formerly 683b558d25 [formerly 812fc2dc49] [formerly bc8875c276] [formerly 5756c660b4 [formerly bc8875c276 [formerly d8f55d811a11bdb76f69dc7a5ee7cd656c8e63fe]]]]
Former-commit-id: 5756c660b4
Former-commit-id: f131c4e662 [formerly 452cf666c9] [formerly 5839f437bc175a5dc6f34b7f4a12d2513703747c [formerly a5954a12a0]]
Former-commit-id: bd31b53e75136cbd39a123ff512cf1d120f26b8b [formerly 7c41fd4916]
Former-commit-id: 73dbc66946
2015-02-18 13:53:36 -05:00
David Friedman
c1c3c45e60 ASM #17125 - Fix decoding of upper air collectives
Change-Id: I20e342561ce80460b2c1189277a45de539bc6540

Former-commit-id: f7649af19e [formerly 38bf119d23] [formerly 79fb68aeb1] [formerly f7649af19e [formerly 38bf119d23] [formerly 79fb68aeb1] [formerly ab8a709eb6 [formerly 79fb68aeb1 [formerly 420ca2787415f4f609fd6016ace1435f87b740f4]]]]
Former-commit-id: ab8a709eb6
Former-commit-id: 1941d007c8 [formerly 28142ae3e0] [formerly 13de6acc13880bac1b4207a50f3965e902f0b7e2 [formerly c68555be0f]]
Former-commit-id: 470c84b6d6cf4ae5b51641d9a6d3c73165f38d37 [formerly bcd4b6c56f]
Former-commit-id: 73c8c03e9f
2015-02-18 16:21:31 +00:00
mjames-upc
4b3291a4f6 move FFMP shapefiles to awipscm outside of repo
Former-commit-id: c2019cc835
2015-02-17 13:45:51 -07:00
mjames-upc
3170e14759 service manager not gets IP addy from hostname rather than ifconfig
Former-commit-id: 8fdd97e7b4
2015-02-17 13:38:37 -07:00
mjames-upc
e22486eaae now build postgres with openssl support
Former-commit-id: 2b40e7e8ab
2015-02-17 13:18:21 -07:00
Fay.Liang
cb7a43e8c3 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 4be7ba08fb [formerly 058bd4ae9c] [formerly a534707534] [formerly 4be7ba08fb [formerly 058bd4ae9c] [formerly a534707534] [formerly 31dcfdc402 [formerly a534707534 [formerly ef870235658ea88d676ca65611bcfbdd56d206b1]]]]
Former-commit-id: 31dcfdc402
Former-commit-id: e8661914e2 [formerly 06750bbcde] [formerly 18c236088dc90fd7520ec043c4c7a40fc9c592e5 [formerly b55148442d]]
Former-commit-id: b13d81293916e5acb59bf966e653712fc00da82b [formerly e24545fbcc]
Former-commit-id: d84ada842d
2015-02-17 14:07:11 -05:00
Sean.Webb
c318c9f021 ASM #17142 - Fixed nwps dir permissions
Change-id: Ibd843098cea02d3f1ea6b75d3e715d804c5c1e37

Former-commit-id: 289d7078aa [formerly 62e125667f] [formerly 9d46bf24dc] [formerly 289d7078aa [formerly 62e125667f] [formerly 9d46bf24dc] [formerly edae59425b [formerly 9d46bf24dc [formerly fc7258495581cd1d241f55aba2a8e60053575571]]]]
Former-commit-id: edae59425b
Former-commit-id: e0d21f3fca [formerly 9e1b6846d3] [formerly 35af8fb21c3587bbdcfa3f587fd78f2514715159 [formerly c530e44a15]]
Former-commit-id: 4ddec7dc48de42c20affe014c17af84375f505c5 [formerly c8445f320e]
Former-commit-id: 8ea8be130a
2015-02-17 12:29:55 -05:00
Fay.Liang
f04f1afca0 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: c37a5fe707 [formerly 0d69148241] [formerly 40e08b3f99] [formerly c37a5fe707 [formerly 0d69148241] [formerly 40e08b3f99] [formerly 5af44f02e0 [formerly 40e08b3f99 [formerly 49f4bfffc2197ab78eead4de677f1ab9e4bf37a2]]]]
Former-commit-id: 5af44f02e0
Former-commit-id: b056821a2a [formerly c1d9a3693e] [formerly 9119518d29968701075d827b5ec3a781fc071dc8 [formerly f9cb790d0f]]
Former-commit-id: 3d80d6e443e6fd1fa8518e5b85b9a91acfe08dfe [formerly e038f793e8]
Former-commit-id: 79fe24e56a
2015-02-17 10:50:41 -05:00
mjames-upc
d83d8a3c4c change PreReq for edex-upc RPM to from awips2-common-base to awips2-tools to avoid cave RPM dependency.
Former-commit-id: c571fb806c
2015-02-14 12:30:47 -07:00
Ana Rivera
cd23e91315 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: 04aa4b6cbe [formerly a2f42298b6] [formerly 76b6b292cb] [formerly 04aa4b6cbe [formerly a2f42298b6] [formerly 76b6b292cb] [formerly 94d705e210 [formerly 76b6b292cb [formerly 6f58cd962cc7995af01b96db1210e24b63429372]]]]
Former-commit-id: 94d705e210
Former-commit-id: 233e6a525b [formerly ec3f4cc548] [formerly 7ec5dbe305ff0c7297cdfc680beaa94d9c348a37 [formerly b9311a0c35]]
Former-commit-id: 63efec361be1c9a350b256b46a52983879d62572 [formerly a13e186a09]
Former-commit-id: d62adba10e
2015-02-13 19:51:48 +00:00
Fay.Liang
d85cd3aaab 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: 7c53d1fccc [formerly c95baa3c40] [formerly 8cdd180b0a] [formerly 7c53d1fccc [formerly c95baa3c40] [formerly 8cdd180b0a] [formerly af8b95bb97 [formerly 8cdd180b0a [formerly fd4e0b9ada38ab93586088948809279e39a0374c]]]]
Former-commit-id: af8b95bb97
Former-commit-id: c1715cac7e [formerly f18381db69] [formerly ac10a3e861970875d87c499e6a2398f3d551fd4f [formerly 8d5a9c2045]]
Former-commit-id: 127f2236362d5f991e36f6c4c323c20811ec4b74 [formerly 984091af0c]
Former-commit-id: 2546eeb607
2015-02-13 09:34:24 -05:00
Fay.Liang
b8da0f41f6 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 209b1f9e7c [formerly 84dff9abc0] [formerly 32c91172b4] [formerly 209b1f9e7c [formerly 84dff9abc0] [formerly 32c91172b4] [formerly eefa05ada3 [formerly 32c91172b4 [formerly 480b6597331ebd2ce7d7835de6e21050abf18722]]]]
Former-commit-id: eefa05ada3
Former-commit-id: 1d04cbde57 [formerly f4106951e2] [formerly fd8f5f456a4b12eae3d16683880d413105e09ff4 [formerly 2b261f9ef2]]
Former-commit-id: 2221a324ff2b21942c4ddee4c8c8cdc4e7d435e0 [formerly 444b080629]
Former-commit-id: cf869f38ce
2015-02-13 09:32:40 -05:00
Fay.Liang
dbe9a2c113 Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 6d85666c42 [formerly b54c101e34] [formerly adc24b15b6] [formerly 6d85666c42 [formerly b54c101e34] [formerly adc24b15b6] [formerly 92d4e5b370 [formerly adc24b15b6 [formerly c08dc1a7d558fba175460ef8255fc3b7b1db5c71]]]]
Former-commit-id: 92d4e5b370
Former-commit-id: b256e725fb [formerly 450bfe4dca] [formerly 7728e96a5db766ae0e5b53826589d6ea7bfef4d5 [formerly fbdb149621]]
Former-commit-id: 2f8eaa427fbc1cbd56e930c643e0224637c1d97b [formerly 709c5ac369]
Former-commit-id: 13b425347f
2015-02-13 09:29:20 -05:00
mjames-upc
f3760d1f1c clean up dependencies for the pgadmin3 build. edits to EDEX deploy/build.
Former-commit-id: d17c079178
2015-02-12 21:58:37 -07:00
mjames-upc
6d0fbd2765 workaround to get viz RPMs to biuld, but this will still fail on install.
Former-commit-id: 533819c7b8
2015-02-12 21:57:39 -07:00
mjames-upc
2a50cae2ba mucking with groups and layout in the NCP resource loader
Former-commit-id: 497a243a78
2015-02-12 21:56:59 -07:00
mjames-upc
31dbd2022e updates to ldm and upc rpm builds
Former-commit-id: e81048353c
2015-02-12 21:56:06 -07:00
mjames-upc
38cf8403cb a lot of build updates for 14.4.1. removed desktop autostart stuff, edits to get wes2bridge to build, and reoganization of UPC build programs.
Former-commit-id: 1a280b79d6
2015-02-12 21:55:36 -07:00
Shawn.Hooper
517bb0a96a ASM #15083 - Updates to allow nwps to be released in the gfesuite-server rpm
Change-Id: I9ab3fca601120954ebe229d3a4f0871b7b43af28

Former-commit-id: 77344aeb28 [formerly 0d9e4dd69e] [formerly 060a169904] [formerly 77344aeb28 [formerly 0d9e4dd69e] [formerly 060a169904] [formerly 9c637bda0b [formerly 060a169904 [formerly 2c62f45654b0531349fef5e7523c67c94236ce1a]]]]
Former-commit-id: 9c637bda0b
Former-commit-id: ea6d93e483 [formerly 89d1309974] [formerly f55b21a9fdea3ba2e3dba375325c811c5e063e31 [formerly 5ff97ae188]]
Former-commit-id: 155d896c67c9e8820e1531b42b396d247d8e942d [formerly b29bfba24b]
Former-commit-id: 19cdb600ed
2015-02-12 17:32:05 -05:00
David Lovely
afcd1dd5b6 Omaha #3300 Fixing merge errors in PointPrecipPlotResource
Change-Id: I6c5b8f0f2e590b0cf0440c1885435c2bf5649df4

Former-commit-id: d71e91a297 [formerly 260a818778] [formerly 56c3135aef] [formerly d71e91a297 [formerly 260a818778] [formerly 56c3135aef] [formerly 25f32b4c70 [formerly 56c3135aef [formerly e7968f03e688e7dbad9a2e87b9de7f0664997a5f]]]]
Former-commit-id: 25f32b4c70
Former-commit-id: 7782f738b9 [formerly d282d70d60] [formerly fb0588046442bda24401b075821a17c3dc4f20a1 [formerly ca03110763]]
Former-commit-id: 21decff89559ef10af1d1397315f20a28233e434 [formerly 7322783d3f]
Former-commit-id: d6913e3259
2015-02-12 09:16:30 -06:00
Juliya Dynina
fda10c84dc Merge "ASM #17092 - Add cronOTRs.xml to radar NDM files" into asm_14.4.1
Former-commit-id: 0858e5a32c [formerly 92d2d08451] [formerly ea11991a31] [formerly 0858e5a32c [formerly 92d2d08451] [formerly ea11991a31] [formerly 39e3497493 [formerly ea11991a31 [formerly 346fc7563a680155c286bcbbcdaea25ec12b30fc]]]]
Former-commit-id: 39e3497493
Former-commit-id: 0e43b7d9d6 [formerly 983ef5cfbc] [formerly f11bfaa861f4d77f3c36754b140092cb2de3aaa7 [formerly 02f0a44ab7]]
Former-commit-id: c7819cc6cfc2f0acc01b6e9a95712c7059e2c2d8 [formerly 3fdbb2e68f]
Former-commit-id: 1959b0f855
2015-02-12 09:20:27 -05:00
Ana Rivera
f94b97d128 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: 46215020b2 [formerly 461db8a395] [formerly 420132b396] [formerly 46215020b2 [formerly 461db8a395] [formerly 420132b396] [formerly 6191c93a9c [formerly 420132b396 [formerly f6b3765fc1670db2b9ceef75be7422a07b2badcf]]]]
Former-commit-id: 6191c93a9c
Former-commit-id: 163822ed83 [formerly 726045354b] [formerly 828f01ac20d6f6b8cfe06c00f5261d19e5ae4286 [formerly d8b54a59cf]]
Former-commit-id: 10f7d308dfa2905bfc05ed43017ea87858618d14 [formerly 85de48c8bf]
Former-commit-id: cb4300775b
2015-02-11 22:00:40 +00:00
Steve Harris
7718c17e3d Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10


Former-commit-id: a2d87f74f7 [formerly e76330fac0] [formerly 3fe3d35339] [formerly a2d87f74f7 [formerly e76330fac0] [formerly 3fe3d35339] [formerly 9311e6f440 [formerly 3fe3d35339 [formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]]]]
Former-commit-id: 9311e6f440
Former-commit-id: f59cef1b7a [formerly 300e3e50fe] [formerly 9b94ac3d16cf083d4502b712efe3cac0bbc0889c [formerly 6a2d5ec16d]]
Former-commit-id: 28adc946fa3fbd5f3f87e0fa9e9c02ac79c68d1b [formerly 07475d998f]
Former-commit-id: f2f6d56366
2015-02-11 15:53:38 -06:00
Fay.Liang
2bdcc21b94 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: a0dc16d150 [formerly 4f75f6d15e] [formerly 5ed7f62638] [formerly a0dc16d150 [formerly 4f75f6d15e] [formerly 5ed7f62638] [formerly eef951faea [formerly 5ed7f62638 [formerly 3905161a55f66efb33b1fe4bc016545b367e88c1]]]]
Former-commit-id: eef951faea
Former-commit-id: 882c2a990e [formerly cea66a5add] [formerly 07d175fdc3ad08f5194833ce24139ca1f76e6166 [formerly c8538cded1]]
Former-commit-id: 2eefaa0f322d04065e7f1a2fad28dcbf17d89674 [formerly 788f327e6a]
Former-commit-id: dd338a5111
2015-02-11 15:36:25 -05:00
Fay.Liang
29c9534a5e Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 8a38eb3a97 [formerly 8d4bab98d5] [formerly 30859f6ee6] [formerly 8a38eb3a97 [formerly 8d4bab98d5] [formerly 30859f6ee6] [formerly 1208dbde06 [formerly 30859f6ee6 [formerly bc482f433223eee5f9a2fa209e1e33a39d3b3aa8]]]]
Former-commit-id: 1208dbde06
Former-commit-id: 78101fed22 [formerly c8b9377e84] [formerly fe3c9f2d6f1216e7a04c3787ad7cd2442abe36cb [formerly 10c325518c]]
Former-commit-id: 2c9d0fc8e7d57b336fb7a1d64dd163b3f020d1a0 [formerly 9f2f5af448]
Former-commit-id: 9f124dc2e5
2015-02-11 15:36:05 -05:00
Jason Burks
f4dda33ce0 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: b729c8dac9 [formerly c28f2e9aed] [formerly 0163ec2871] [formerly b729c8dac9 [formerly c28f2e9aed] [formerly 0163ec2871] [formerly 9b0f630436 [formerly 0163ec2871 [formerly 2ca313195e2e610d4a198884f45dde37ebecfbc6]]]]
Former-commit-id: 9b0f630436
Former-commit-id: ab74cf5afc [formerly 526bae6daf] [formerly 401d5d6f47b5f0c3a6c78f106a1f30f94ce28dbe [formerly e33ed09969]]
Former-commit-id: dfecf3c15666e10f475b44eadc6304b5ce78f8f8 [formerly 8fe81f8959]
Former-commit-id: b521b1d445
2015-02-11 20:06:54 +00:00
Shawn.Hooper
b2ac91adb7 ASM #14246 - Check-in updated transmit_rfc_qpe script
Change-Id: I26751d39d2b31a345276da722c7a25a9ff8f9508

Former-commit-id: 77ae8677e4 [formerly a6a840f3c8] [formerly 0ba143cc43] [formerly 77ae8677e4 [formerly a6a840f3c8] [formerly 0ba143cc43] [formerly 3c3b69809d [formerly 0ba143cc43 [formerly 72dd2f411e10e1eb6a934adf05d7df179b570ded]]]]
Former-commit-id: 3c3b69809d
Former-commit-id: ad9630134e [formerly 91cbf5e2da] [formerly e85c832fb1634edb90d5121038f2ab2a50a31b76 [formerly 41ebbc98d4]]
Former-commit-id: 0794da6025723d3e5c15568bfbd663cac45eba12 [formerly 97de46bbb8]
Former-commit-id: 89ab24bc32
2015-02-11 13:55:20 -05:00