Commit graph

4721 commits

Author SHA1 Message Date
Dave Hladky
a6d07e82a6 Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2

Former-commit-id: 912c7e2d12 [formerly 39343e1801] [formerly 3ac04dd071] [formerly 912c7e2d12 [formerly 39343e1801] [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 3ac04dd071 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: c978694653 [formerly e464a1d8f8] [formerly 52a66b8f177ba3fcebbd8fee9b4e8b300ae9ba10 [formerly 43cbcff538]]
Former-commit-id: a34ec85b7be5311fc6e20f3d93ca82b2276e2023 [formerly 3d61ca32f6]
Former-commit-id: a37f87968c
2014-03-24 08:27:12 -05:00
Brian.Dyke
f95e1ed18b Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly 9c412e444e [formerly d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]]
Former-commit-id: 9c412e444e
Former-commit-id: 39ef07d49f [formerly 57f7e4b084] [formerly 636e94e2d71aeb03e5b65c5b9c64ecd494fad03f [formerly 88efccf309]]
Former-commit-id: b74e99a753d5ddafa0c2b9e7a7ee76f3251376c4 [formerly 35427557c4]
Former-commit-id: 5fb2fe9266
2014-03-14 11:13:30 -04:00
Brian.Dyke
85d43db6af Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 670c673e8a [formerly 24a63fb05a] [formerly 030a18f804] [formerly 670c673e8a [formerly 24a63fb05a] [formerly 030a18f804] [formerly 30084d7f84 [formerly 030a18f804 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]]]
Former-commit-id: 30084d7f84
Former-commit-id: 024d49d48b [formerly 916fec5a4f] [formerly ef3d48a76a5bbff4e7d32e4ab3916273c583f0ec [formerly 2109409b24]]
Former-commit-id: 45c14c936cdd09a6b0550940abd94e61b8350680 [formerly f20020876a]
Former-commit-id: 92ed2895fb
2014-03-14 10:15:53 -04:00
Brian.Dyke
b6b38c0121 Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: a68bda6858 [formerly 4e3096631d] [formerly d4b6d22ae2] [formerly a68bda6858 [formerly 4e3096631d] [formerly d4b6d22ae2] [formerly f999e48df0 [formerly d4b6d22ae2 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]]
Former-commit-id: f999e48df0
Former-commit-id: 86ec9a50d4 [formerly 82756e3855] [formerly 2bdb02ad2c8ccb7c77ded0fd2df41688dea93867 [formerly 3ab2df3507]]
Former-commit-id: 1bf9fe1b47eeea3a212497f6320423ebad1117f1 [formerly 76271269c5]
Former-commit-id: 516ba8e81a
2014-03-14 08:44:39 -04:00
Brian.Dyke
f417ded1bb OB_14.1.1-23 baseline
Former-commit-id: b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly dcc2e4fd61 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]]
Former-commit-id: bc6a7bf946
Former-commit-id: 6c021d0eec [formerly e78e030b7c] [formerly ea51c2c24eabbc975758d2dfad3f260a10c7718d [formerly 8f72db144b]]
Former-commit-id: 15a710f2de86297f2fae98fe2c109c5d01b1953d [formerly c7fbd5dfe4]
Former-commit-id: be8f052cff
2014-03-14 08:18:16 -04:00
Kevin P. Johnson
fd16da4ae4 ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67

Former-commit-id: c791f55d02 [formerly e3a951da78] [formerly b2797a0788] [formerly c791f55d02 [formerly e3a951da78] [formerly b2797a0788] [formerly 4c833d3389 [formerly b2797a0788 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]]
Former-commit-id: 4c833d3389
Former-commit-id: 54316530e4 [formerly 32b372db4b] [formerly 6cd2437734cdee7992443a141d1ae3334e20f72d [formerly 17a4229072]]
Former-commit-id: 692a687b6edde3278b185df9e4ad90705444abee [formerly eb12ec9c14]
Former-commit-id: 90a9e642e3
2014-03-13 20:42:12 +00:00
Ben Steffensmeier
b6b13cea10 Issue #2528 Fix satellite units/style.
Former-commit-id: eb922ea2e2 [formerly e6cd8b3167] [formerly 77041e5b17] [formerly eb922ea2e2 [formerly e6cd8b3167] [formerly 77041e5b17] [formerly 75120a09cd [formerly 77041e5b17 [formerly 7e38454a31aa55c606c155a108253c0433ecb517]]]]
Former-commit-id: 75120a09cd
Former-commit-id: 82a8490dfc [formerly e2995114dc] [formerly b6272ae932f2784e4677fe602769adb1fef911b2 [formerly d29daf8ede]]
Former-commit-id: 3fdb707afe0c7c8354db1df1089d473246d1649a [formerly fc62e2679d]
Former-commit-id: 1bde438f3a
2014-03-12 14:19:49 -05:00
Richard Peter
64feddc462 Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
Former-commit-id: 4d5c7e49f9 [formerly e981ce3e36] [formerly 18234c5d73] [formerly 4d5c7e49f9 [formerly e981ce3e36] [formerly 18234c5d73] [formerly f59d1433db [formerly 18234c5d73 [formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]]]]
Former-commit-id: f59d1433db
Former-commit-id: 90f3b627af [formerly cc35481b48] [formerly 5f03de8c59b4bb9535d972f40d6cc693c365c3da [formerly 76f15c73dd]]
Former-commit-id: ff2e21df08c5b0602d23df7b135c00450a1c40da [formerly 937c89866d]
Former-commit-id: 318c61b1bf
2014-03-11 16:43:37 -05:00
Dave Hladky
177e76f996 Issue #2678 end retrieval double clutching
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

Former-commit-id: b440063bb9 [formerly 7cd4304140] [formerly 3500ad262a] [formerly b440063bb9 [formerly 7cd4304140] [formerly 3500ad262a] [formerly 76e216d319 [formerly 3500ad262a [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]]]]
Former-commit-id: 76e216d319
Former-commit-id: 39cc47bc52 [formerly f3876233e4] [formerly 28b9b16fdbb85a6e9a3afb5298b0813e917a59b1 [formerly 03fd32144a]]
Former-commit-id: 451a7125613fe9ce3c298e07c814874021718d47 [formerly c0d2eb8f6b]
Former-commit-id: 78441a1250
2014-03-11 15:53:59 -05:00
Nate Jensen
95a07d847e Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
Former-commit-id: a9811bdb2c [formerly cef0438c35] [formerly 85f5821a6f] [formerly a9811bdb2c [formerly cef0438c35] [formerly 85f5821a6f] [formerly afbdf6962c [formerly 85f5821a6f [formerly d463531d4cf3bce8862ce1c29b12e9a594d8c63b]]]]
Former-commit-id: afbdf6962c
Former-commit-id: fd0a81a181 [formerly 3411167042] [formerly 2ac85b86fee6285f476e7194d549ae07555767d9 [formerly 09f4bd9883]]
Former-commit-id: 0f271f5e259517b85add913a4d42f6b3fbb92885 [formerly be9744c6f9]
Former-commit-id: 39d73f1569
2014-03-11 12:35:44 -05:00
David Gillingham
7c4f0bcee6 Issue #2509: Fix static topo generation break caused by baseline merge.
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68

Former-commit-id: 751d8956a9 [formerly e3a3cf7bad] [formerly b0783b64ce] [formerly 751d8956a9 [formerly e3a3cf7bad] [formerly b0783b64ce] [formerly 187196b519 [formerly b0783b64ce [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]]]]
Former-commit-id: 187196b519
Former-commit-id: 6fcb5b7e73 [formerly 4179172d0e] [formerly e949b41e8ce1e7c37f0f510cdbbac24e2438f30d [formerly 68edb8d9a1]]
Former-commit-id: db669e661b0dcdd0789172fe8a31d92ad669695d [formerly f30292b471]
Former-commit-id: 0e0fdae804
2014-03-11 11:54:25 -05:00
Ben Steffensmeier
d3992ef6d7 Issue #2896 Fix sat best res on weird projections
Former-commit-id: a9c4875038 [formerly c7fa392f3f] [formerly 8bb517836a] [formerly a9c4875038 [formerly c7fa392f3f] [formerly 8bb517836a] [formerly 560fc688bc [formerly 8bb517836a [formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]]]]
Former-commit-id: 560fc688bc
Former-commit-id: 20b99bc6c5 [formerly 7a06fdd71a] [formerly 3dd12b4d2d8faad952b606b3c39220f5602545d4 [formerly b474e92189]]
Former-commit-id: 5c6ba99d716537fdfe23db7e188caebb8b401e59 [formerly 30683880ee]
Former-commit-id: 470ac4a1b9
2014-03-11 11:07:43 -05:00
Nate Jensen
611915a88c Issue #2779 update memory settings for renamed NC perspective
Former-commit-id: ebf5186d75 [formerly 17aa39ce0a] [formerly ccb06db199] [formerly ebf5186d75 [formerly 17aa39ce0a] [formerly ccb06db199] [formerly 5eb892f4cf [formerly ccb06db199 [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]]]
Former-commit-id: 5eb892f4cf
Former-commit-id: 219f232fcb [formerly 42c545804c] [formerly dc64b4c9b5a35e0a38967549f2d086cd34c1fedf [formerly 22ff235bcf]]
Former-commit-id: c46da055ba6866f0ae818586090fa0544db52dc7 [formerly 15a2fb216e]
Former-commit-id: 391deee18c
2014-03-11 10:28:01 -05:00
Brian.Dyke
b34425dbf0 Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
Former-commit-id: 1cb3691cc4 [formerly fa16721854] [formerly 552490206f] [formerly 1cb3691cc4 [formerly fa16721854] [formerly 552490206f] [formerly fcc9115b0d [formerly 552490206f [formerly eaa41b4f2dd9fce2d957a2311ee3f4f04f220365]]]]
Former-commit-id: fcc9115b0d
Former-commit-id: a42c10c21d [formerly 3070b42ed3] [formerly 96892f7695c369e44e299b4077a8590a12b79541 [formerly 83822661e8]]
Former-commit-id: 976fbb149cf7a3f819169004bcb228fd4ddf1282 [formerly fdaab3d981]
Former-commit-id: b301ef8190
2014-03-11 10:44:03 -04:00
Juliya Dynina
98b24cf46b Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
Former-commit-id: 2b55a4240e [formerly b3ec4c363f] [formerly 6bbd88e62c] [formerly 2b55a4240e [formerly b3ec4c363f] [formerly 6bbd88e62c] [formerly 7952862443 [formerly 6bbd88e62c [formerly a167748b77baad66784893304a18e8866f5471f1]]]]
Former-commit-id: 7952862443
Former-commit-id: d1b202fcd0 [formerly bedc9082b0] [formerly 30b12a7237013355ab82100b5cd40d97cfd766da [formerly 7e35f36651]]
Former-commit-id: 187c2bed7707310ed1c946986736df1dabeef617 [formerly 7966aac771]
Former-commit-id: ddf1c4f4f6
2014-03-11 09:24:12 -05:00
Brian.Dyke
0d72b90e5e Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
Former-commit-id: 90154e7ae1 [formerly bcf9a5dc83] [formerly c6f2010ce6] [formerly 90154e7ae1 [formerly bcf9a5dc83] [formerly c6f2010ce6] [formerly 4269f9d875 [formerly c6f2010ce6 [formerly 0e02910adc2ef73df2eff5b41c1e9945a5536a0a]]]]
Former-commit-id: 4269f9d875
Former-commit-id: 3667299983 [formerly c26c40d6e3] [formerly 738fc5f415c773f7bde24fd1a60b618f33307d23 [formerly a453d3fd68]]
Former-commit-id: 58e4c89bd43a8a7a0f7edf067cf9dff34a054c40 [formerly 57b5d77dee]
Former-commit-id: 305b2563fa
2014-03-10 15:42:38 -04:00
brian.dyke
3b1dd43698 Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
Former-commit-id: 730491d4bb [formerly 1a482f91bc] [formerly 654778bb0d] [formerly 730491d4bb [formerly 1a482f91bc] [formerly 654778bb0d] [formerly b1b216f196 [formerly 654778bb0d [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]]
Former-commit-id: b1b216f196
Former-commit-id: 41a37605d4 [formerly d1b389ae05] [formerly 9bef04b7d89a16100ee76d159ab4225ead55540a [formerly d57a3dd24c]]
Former-commit-id: db4eabc17ce8b18f073611f9c641761f09467a04 [formerly f3df3e3690]
Former-commit-id: fba0188c90
2014-03-10 15:36:56 -04:00
Brian.Dyke
0a1ef77d16 Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1
Former-commit-id: 8d4a1e1204 [formerly 24785068be] [formerly d710aec521] [formerly 8d4a1e1204 [formerly 24785068be] [formerly d710aec521] [formerly fda6ab1344 [formerly d710aec521 [formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]]]]
Former-commit-id: fda6ab1344
Former-commit-id: d197a72c20 [formerly c5502af3fa] [formerly 6ec1b00cf64c71cead90fca582edef188ec24710 [formerly 0aff5875b0]]
Former-commit-id: 28dc637ae8563b78153684cbfa60e954caea69c9 [formerly dcade6e18a]
Former-commit-id: 26e19974d1
2014-03-10 15:14:59 -04:00
Nate Jensen
c508c4d9bb Issue #2779 add .ini generation of memory settings for other components
Former-commit-id: b77dde280f [formerly 5a88f31a2b] [formerly 6a75fe686a] [formerly b77dde280f [formerly 5a88f31a2b] [formerly 6a75fe686a] [formerly d599db4af2 [formerly 6a75fe686a [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]]
Former-commit-id: d599db4af2
Former-commit-id: d32d855bb2 [formerly 39aa26c2b6] [formerly 097c1a455c355cc0ebe8f7b95797516bfc05c8c6 [formerly 5094008bea]]
Former-commit-id: fdddd15a0dc1ec336fdf3059c126c4240f794f5c [formerly 19a0cfb972]
Former-commit-id: 6bafc51abe
2014-03-10 10:03:02 -05:00
Stephen Gilbert
806b78cf4d VLab Issue #3224 - NSHARP: Fix erroneous mixing heights
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2

Former-commit-id: 8560c21c50 [formerly 200c7e60da] [formerly 65dd8b4c3c] [formerly 8560c21c50 [formerly 200c7e60da] [formerly 65dd8b4c3c] [formerly f203a4c035 [formerly 65dd8b4c3c [formerly 459cd2e6772efa05a683073798a1d4424aa2facf]]]]
Former-commit-id: f203a4c035
Former-commit-id: 803a4584c9 [formerly 00c1f40997] [formerly ad4b7bcc63f7e8c66ec4b0f39eea3f4a987956f1 [formerly 46ebeb9969]]
Former-commit-id: d34facf3627b4a21886984446a4d5d04222a5da1 [formerly abb11feb16]
Former-commit-id: aaa14d1b1d
2014-03-07 19:10:08 -05:00
Stephen Gilbert
e3d279329d VLab Issue #3223 - NSHARP: Improve selection operation
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d

Former-commit-id: ba4869af46 [formerly 5fcb45a629] [formerly 9a457213bb] [formerly ba4869af46 [formerly 5fcb45a629] [formerly 9a457213bb] [formerly e3aedaa1d6 [formerly 9a457213bb [formerly 16fcc171c65d79d5698feeb3ff0ace49c31d976f]]]]
Former-commit-id: e3aedaa1d6
Former-commit-id: fb4c74e0cd [formerly c4b73eb02e] [formerly c9da8cd134141da14e27b89961b37aff9bce21eb [formerly b1e1d9178a]]
Former-commit-id: d2c9ed404a1b1977c532dfd66aa6f8681ccc6fad [formerly 05328b9103]
Former-commit-id: 08b8f4c679
2014-03-07 19:07:28 -05:00
Stephen Gilbert
5652cbdde4 VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57

Former-commit-id: 78e4214f3d [formerly a7fd09a409] [formerly 1632166902] [formerly 78e4214f3d [formerly a7fd09a409] [formerly 1632166902] [formerly 49a6d6ec7e [formerly 1632166902 [formerly 24e07a3215a7879e459afc74e020eab0a8e1c646]]]]
Former-commit-id: 49a6d6ec7e
Former-commit-id: fee37acf0c [formerly 6d40a42c39] [formerly cf3ae4ba60186788d49675c04096c67eee23603a [formerly de6e50d8e6]]
Former-commit-id: 6488fc0d38e5381f3847719213a5fbb4e7249d10 [formerly 40a62c63cd]
Former-commit-id: 5eea989db5
2014-03-07 18:49:21 -05:00
Stephen Gilbert
3787125175 VLab Issue #3221 - Fix XML serialization problems
A few problems reading/writing XML files were noticed after upgrading to
14.2.1.  This commit fixes the saving of SPFs, reading of image style
rules, and the location of lockedColorMap file.

Change-Id: I8aad4197029c70f72612299a25329687892884af

Former-commit-id: 6f8caa3515 [formerly cce06bfbe3] [formerly 625fcb0064] [formerly 6f8caa3515 [formerly cce06bfbe3] [formerly 625fcb0064] [formerly 6dd6ae8d36 [formerly 625fcb0064 [formerly 4f58998c899e28521658bf17dee852592c534713]]]]
Former-commit-id: 6dd6ae8d36
Former-commit-id: b69374b56d [formerly ce73240c40] [formerly 53869af84fd3c1760276c2fccf36acd25767d8aa [formerly 204d047289]]
Former-commit-id: 24c6ee760a153abacd30869121c5aeaaddae79fa [formerly ebafac1725]
Former-commit-id: e0f2f91b21
2014-03-07 18:36:42 -05:00
Steve Harris
3348f6857a Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]]
Former-commit-id: 40b543f9a8
Former-commit-id: a94f800324 [formerly 4d1fbf8743] [formerly b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]]
Former-commit-id: 0b70d2b7739772b630136c56408866dc53a2bdcd [formerly ea01373320]
Former-commit-id: e29b96b6bd
2014-03-07 15:16:18 -06:00
Shawn.Hooper
671d334f18 ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28

Former-commit-id: bd02f6a1a6 [formerly e894b1279a] [formerly 41a4905f9f] [formerly bd02f6a1a6 [formerly e894b1279a] [formerly 41a4905f9f] [formerly 56a949fba8 [formerly 41a4905f9f [formerly b18b8f64040b1c41810f391b8ed785327b6e5d59]]]]
Former-commit-id: 56a949fba8
Former-commit-id: 1acdbf20f2 [formerly 84b71d7252] [formerly 8e558f4668f969675b3426aa8d9a1fd8674746ec [formerly aa827610b1]]
Former-commit-id: 16550e6ebdc23f503b230c433c6ada3ea1da148b [formerly fb673d390f]
Former-commit-id: df59dabcb5
2014-03-07 14:53:54 -05:00
Shawn.Hooper
aedaebcd97 ASM #377 - Baseline National River Location Database fails
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae

Former-commit-id: 94e4e3e649 [formerly 6a8a1c397b] [formerly 670da1895b] [formerly 94e4e3e649 [formerly 6a8a1c397b] [formerly 670da1895b] [formerly 85db05e819 [formerly 670da1895b [formerly 5dcb5b019f389e64435b0283d95fe477032d88cc]]]]
Former-commit-id: 85db05e819
Former-commit-id: d549088e33 [formerly b7cf50dd31] [formerly 32e11e96551b8e3081b3d4dde88e4590083e6392 [formerly 62a0c1dadf]]
Former-commit-id: b7f2c27096f052aab3c364f5bc82543098085d30 [formerly 6401571e92]
Former-commit-id: 94a008ff56
2014-03-07 13:12:11 -05:00
Shawn.Hooper
20c67c86e1 ASM #378 - MPE gages are not listed/available in gage table
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a

Former-commit-id: fb051c5a5f [formerly b46b87cb5e] [formerly 8c9f9b3ae0] [formerly fb051c5a5f [formerly b46b87cb5e] [formerly 8c9f9b3ae0] [formerly dc3aadd149 [formerly 8c9f9b3ae0 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]]]]
Former-commit-id: dc3aadd149
Former-commit-id: e33de27296 [formerly 68d8f9be14] [formerly f304d2fa3946f5a199255a03597cdc0f3f79d636 [formerly 05bb380e77]]
Former-commit-id: 701e61da1838f2875ec87860a05500044bd28ae9 [formerly 26a112b34b]
Former-commit-id: db1c090463
2014-03-07 12:57:36 -05:00
Brian.Dyke
15a5404df3 Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
Former-commit-id: 92bff38059 [formerly 48cc3b6c55] [formerly 3ac2a61218] [formerly 92bff38059 [formerly 48cc3b6c55] [formerly 3ac2a61218] [formerly 1fe5504d4c [formerly 3ac2a61218 [formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]]]]
Former-commit-id: 1fe5504d4c
Former-commit-id: 1f7e61b3df [formerly 48f1f544d6] [formerly a7d6f4f47c9df94b8ae88988530dc06d80b92b0a [formerly 0c4b9469b0]]
Former-commit-id: abc0a250d76460ad95e9e08c0cae29d6d481bfd2 [formerly 795c5424cb]
Former-commit-id: d9f1b98ce7
2014-03-07 11:50:06 -05:00
David Friedman
87ed26568e ASM #349 - Workaround for QPID-5569
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce

Former-commit-id: b8aadf1781 [formerly 103fece7b7] [formerly 2c1a3442d6] [formerly b8aadf1781 [formerly 103fece7b7] [formerly 2c1a3442d6] [formerly a58f3cb7df [formerly 2c1a3442d6 [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]]]]
Former-commit-id: a58f3cb7df
Former-commit-id: 951bd668ae [formerly 91b22ff9bb] [formerly 38bf85175bedb3976ea85ab928e8bdea8f6e4a64 [formerly 2a4a92c223]]
Former-commit-id: e4fe776694b8d4beb5605017347016019fb2ec75 [formerly ab5f533c72]
Former-commit-id: 2eb0b3dfb0
2014-03-07 14:58:09 +00:00
Brian.Dyke
603695a2a4 Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: c2449e7821 [formerly a0e3f08fce] [formerly 394076196b] [formerly c2449e7821 [formerly a0e3f08fce] [formerly 394076196b] [formerly 7b798ab5d2 [formerly 394076196b [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: eb6abe6faa [formerly fa189c0ef6] [formerly e502d460a99724c0ff3efb14c8d0f8d731aad320 [formerly 6ced1bedc2]]
Former-commit-id: c243cc113e92d596862d61e7a6a2878bf1eafda3 [formerly c8b3730fef]
Former-commit-id: ac07a4fc49
2014-03-07 09:01:09 -05:00
Brian.Dyke
b8ee763baa Merge branch 'fun_merge' into master_14.2.1
Former-commit-id: e1cc8eb59a [formerly 0bbf137b05] [formerly 312cd8a3e8] [formerly e1cc8eb59a [formerly 0bbf137b05] [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]]
Former-commit-id: 6414bdab57
Former-commit-id: 50621ec3e5 [formerly 2eec413d72] [formerly 1e0890d0f70a0aeffbbcabd7f8be3e396daae297 [formerly 2f94480121]]
Former-commit-id: d006a47edee1a1939aadf15ef61024f22a80931d [formerly 8f2271403d]
Former-commit-id: da36dde938
2014-03-07 08:57:07 -05:00
Brian.Dyke
ed94e1bc6b 14.1.1-22 baseline
Former-commit-id: 1dcc56775d [formerly fe30e1d545] [formerly 21f17d4f9b] [formerly 1dcc56775d [formerly fe30e1d545] [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly 21f17d4f9b [formerly ae37ad5bac445251d1456f37588819fccfede061]]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: 3c9cde458a [formerly 9406a1d6c0] [formerly f1658f5e11228e084b4f3ed536ccf891c20f621a [formerly a4c136fd60]]
Former-commit-id: 385ffc492ff49872acfb40d1c47fffb7dff76ec2 [formerly 067802b104]
Former-commit-id: c1dab50ce0
2014-03-07 08:49:00 -05:00
Steve Harris
f7a15a87e5 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 93aa41a34b [formerly 3358e8d6ef] [formerly 7f1ad89df9] [formerly 93aa41a34b [formerly 3358e8d6ef] [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 7f1ad89df9 [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]]
Former-commit-id: a2e36f4c6c
Former-commit-id: 3715195901 [formerly 2371a74a29] [formerly 4de1a1cd26a0d873cc898cd411cc38ab4cc889c6 [formerly 8ec20fc5e9]]
Former-commit-id: 550b2170a0e7b2252cdcb3421b25e5704cf2cdac [formerly 104b3d369a]
Former-commit-id: 71c8e15b78
2014-03-06 18:19:55 -06:00
David Friedman
b62acbc154 ASM #74 - Fix RadarServer configuration import utility JAR dependency
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70

Former-commit-id: e7def94c5f [formerly fa849dfefa] [formerly 11d0d191fd] [formerly e7def94c5f [formerly fa849dfefa] [formerly 11d0d191fd] [formerly d08597a0d4 [formerly 11d0d191fd [formerly 1a4183ed991cf1aed5895334c7b823a66ad58a7a]]]]
Former-commit-id: d08597a0d4
Former-commit-id: 3d09743022 [formerly 7efff2943c] [formerly 0bdcf1f23aab3fbfc22ef2ba180d8b9df0c2616a [formerly 591ce333dc]]
Former-commit-id: 89fc9937b925fbd68ad74bb2b24a9bffae38c3df [formerly 89b6f79565]
Former-commit-id: 3dde8aeda7
2014-03-06 17:07:23 +00:00
Brian.Dyke
24affa400b Merge 13.5.3 DR_16824
Former-commit-id: b8a4de2bf0 [formerly 7baa5ee0d5] [formerly b8fd0f16ed] [formerly b8a4de2bf0 [formerly 7baa5ee0d5] [formerly b8fd0f16ed] [formerly dafe7e6a42 [formerly b8fd0f16ed [formerly 1b9ed749da0d1893f44e68400644f37c763e324a]]]]
Former-commit-id: dafe7e6a42
Former-commit-id: e72bd45b20 [formerly 981373f82b] [formerly efa362d2eeba660bf5dac619a16ffd73dbad64c8 [formerly 8c16576a82]]
Former-commit-id: 3a95079d38c634aa43d85134508e3d0b5d606551 [formerly bcf5bf170d]
Former-commit-id: 4e38785329
2014-03-06 11:22:08 -05:00
Brian.Dyke
b1435c612e ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
Former-commit-id: 8c54df9e0c [formerly 26fe429c4b] [formerly 1778d20745] [formerly 8c54df9e0c [formerly 26fe429c4b] [formerly 1778d20745] [formerly 010b7a1df5 [formerly 1778d20745 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]]]]
Former-commit-id: 010b7a1df5
Former-commit-id: df3291e0b4 [formerly 14844a10b6] [formerly 0ef04c99b170216a3f24341f708895d2df66d675 [formerly c6dae5a81f]]
Former-commit-id: 2a8a80f5ec679fb777138b8501782bf43dc7de32 [formerly 863de85b6b]
Former-commit-id: 0c6ba63abc
2014-03-06 11:04:34 -05:00
Brian.Dyke
9762ca9d59 ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
Former-commit-id: e5972b7159 [formerly 6313b7af0c] [formerly 2dbac1697d] [formerly e5972b7159 [formerly 6313b7af0c] [formerly 2dbac1697d] [formerly cb1b4a7ac5 [formerly 2dbac1697d [formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]]]]
Former-commit-id: cb1b4a7ac5
Former-commit-id: b2cd2711f9 [formerly 57a28e817d] [formerly 92fbb4b7ccf0b4c7c32f6ac2ac82358fc9c89c38 [formerly 3fdb85c62d]]
Former-commit-id: ed9a44ece7652bc19f6481662d2caead4061477f [formerly 6f5baf3984]
Former-commit-id: 36e0ad0fdd
2014-03-06 10:56:44 -05:00
Brian.Dyke
db44e7f0ec ASM #124 - Display GLD360 lightning data
Former-commit-id: 972c2c284b [formerly bd81ebd8c2] [formerly db274c890f] [formerly 972c2c284b [formerly bd81ebd8c2] [formerly db274c890f] [formerly eefe8c45fe [formerly db274c890f [formerly 1edba9216beac913f9bd867da9988e213394a396]]]]
Former-commit-id: eefe8c45fe
Former-commit-id: 6ef9f7fd37 [formerly 26140187b1] [formerly 44a38ade0727afc9f135777d46659f273033a036 [formerly b657767cb1]]
Former-commit-id: 5fde31dc71e51a7f747df35d265aff302392ec26 [formerly b9e9126e11]
Former-commit-id: 8de6b2d57b
2014-03-06 10:54:15 -05:00
Steve Harris
a19beb1e5d Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	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.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19]
Former-commit-id: 2db5dcf6eb
2014-03-06 08:39:43 -06:00
Steve Harris
b7bde83b40 Merge branch 'master_14.2.1' into ncep_14.2.1
Former-commit-id: 18ae41769e [formerly 1a666f9f71] [formerly 167ce61d6c] [formerly 18ae41769e [formerly 1a666f9f71] [formerly 167ce61d6c] [formerly 4b01c57c0a [formerly 167ce61d6c [formerly 505bcf7b47aac1344bb46bac690ce83591b8e554]]]]
Former-commit-id: 4b01c57c0a
Former-commit-id: 8dcd31be32 [formerly 12d8ff2fce] [formerly 6f64a4f733692a35b9219e001f7c17834f34eb7c [formerly 6e361c0a57]]
Former-commit-id: b13ffe319da176594078f6a0b2c43783b9cba1cd [formerly b00cecc2ab]
Former-commit-id: 86476b5064
2014-03-05 13:00:23 -06:00
Lee Venable
fadccce7dc Issue #2833 - fixed a widget disposed error.
Former-commit-id: 3c85140ba0 [formerly f38afb0976] [formerly e71dad9c80] [formerly 3c85140ba0 [formerly f38afb0976] [formerly e71dad9c80] [formerly 980e21ca5a [formerly e71dad9c80 [formerly eb3cf0ade9203766a437512b85e55f32108db1e3]]]]
Former-commit-id: 980e21ca5a
Former-commit-id: 8cd4bc1705 [formerly 3966bc355c] [formerly 992ef4747311d55c577dcc1e3ae1650fbf7416ad [formerly 98daa663b4]]
Former-commit-id: d18a297a33ea753e8022b130be13924780e330ac [formerly 7e45b908af]
Former-commit-id: 4b81954f16
2014-03-05 08:37:13 -06:00
Benjamin Phillippe
d51e7a67a0 Issue #2769: Added batching to registry sync
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db

Former-commit-id: 7ad21da089 [formerly 7bf51d507e] [formerly 59323be87e] [formerly 7ad21da089 [formerly 7bf51d507e] [formerly 59323be87e] [formerly 9fd35140f0 [formerly 59323be87e [formerly a265027cacde7690171d30455227c5a843e0d397]]]]
Former-commit-id: 9fd35140f0
Former-commit-id: fe6d70a38f [formerly daeb8bec5f] [formerly 5c8dacb79a884329e899f0613609bd34935428e9 [formerly cd04d7dcbe]]
Former-commit-id: 80271981040d34f22e2ae5038a50b6a25a0fe9ba [formerly 6b6a5b0e4f]
Former-commit-id: d0999c05e8
2014-03-04 13:31:41 -06:00
Richard Peter
f451950ced Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
Former-commit-id: 2b5339e16f [formerly 5280398130] [formerly aa8e1a3625] [formerly 2b5339e16f [formerly 5280398130] [formerly aa8e1a3625] [formerly f9bd27c061 [formerly aa8e1a3625 [formerly 26cbe68f0a86660968016da88a4b51d1735e8227]]]]
Former-commit-id: f9bd27c061
Former-commit-id: 75f96fe190 [formerly a81447f434] [formerly d8b132631aeda3ce7743ca02d1af158db917cca9 [formerly 3b800bcc09]]
Former-commit-id: 3fe7fe9495699d8d98fce4cdb1e4d967ad5f3330 [formerly 9ce19b16cc]
Former-commit-id: 0219b80555
2014-03-04 12:54:23 -06:00
Nate Jensen
587d8e5e1b Issue #2813 fix subscription package names
Former-commit-id: 645fec513a [formerly af76b58b27] [formerly 0ec866f1d2] [formerly 645fec513a [formerly af76b58b27] [formerly 0ec866f1d2] [formerly d7d0803ee9 [formerly 0ec866f1d2 [formerly 081b621b5932d77c03117840e887ed7017f1d48b]]]]
Former-commit-id: d7d0803ee9
Former-commit-id: b920fdd0aa [formerly 78b2b50370] [formerly d585d2501f41607fabbcad8c30a1a4244b7f07c5 [formerly df44f8246e]]
Former-commit-id: e577998904a8996099ae83537da7ff39cf515283 [formerly e22b486f25]
Former-commit-id: 5132a0f8cb
2014-03-04 10:53:58 -06:00
Brian.Dyke
c8111a7ebb OB_14.1.1-21 baseline
Former-commit-id: 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 29681c7ca4 [formerly 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]]]
Former-commit-id: 29681c7ca4
Former-commit-id: c1ef56e0d7 [formerly c68649b4f9] [formerly 146eb0a75db603df40a613354b8cbc0908ec3abb [formerly 7cad374af5]]
Former-commit-id: db6e513aaa9a15a7b11a5aee1b3716c9a5587928 [formerly 079cc93f89]
Former-commit-id: ea56516bf5
2014-03-04 11:47:42 -05:00
Benjamin Phillippe
eb7e448d08 Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: ea31c5b370 [formerly d339e232f4] [formerly ed050996a2] [formerly ea31c5b370 [formerly d339e232f4] [formerly ed050996a2] [formerly 5483d6d7ae [formerly ed050996a2 [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]]]
Former-commit-id: 5483d6d7ae
Former-commit-id: 71d5fbda33 [formerly 603e433054] [formerly d73e719f11d2bc9e27c664078a07b85c55da2615 [formerly 15a5e7c4a4]]
Former-commit-id: 63cf34563d5f8d452ff9585e79b5e00f900f9f9c [formerly 090dbe3918]
Former-commit-id: 719b90e1e7
2014-03-03 10:57:16 -06:00
Lee Venable
94fd0642c2 Issue #2795 - removed test code.
Former-commit-id: fec690642e [formerly e34e636dc7] [formerly 28fe1e99e2] [formerly fec690642e [formerly e34e636dc7] [formerly 28fe1e99e2] [formerly f94bcc4d3f [formerly 28fe1e99e2 [formerly 0e1db42a04b15b8815d59db272b4b2f7b3e79fb9]]]]
Former-commit-id: f94bcc4d3f
Former-commit-id: c03650a0ee [formerly 267fa56e32] [formerly 10016706f9a7d3c987ccd923143821b129a52ef3 [formerly 708de93fc4]]
Former-commit-id: d93fa4eb43702f9e736dbf306c23a51101ba9c87 [formerly d026da3632]
Former-commit-id: 7299c53ba5
2014-02-27 15:46:30 -06:00
Richard Peter
7f36cf564b Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: 63da19f472 [formerly c267c5a08f] [formerly 86d42ed603] [formerly 63da19f472 [formerly c267c5a08f] [formerly 86d42ed603] [formerly 862069dfd3 [formerly 86d42ed603 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]]
Former-commit-id: 862069dfd3
Former-commit-id: 9f43d8e4b2 [formerly 237ada7b8b] [formerly 2ae63270ca0112aca619a0c7564fa8a1154ef4f9 [formerly c0d495d9c3]]
Former-commit-id: 1a965b16ce71e4ece17a9ac8efbc506a1d823b59 [formerly 9489565efb]
Former-commit-id: 68eade49a2
2014-02-27 13:46:47 -06:00
Richard Peter
0f7ab600e6 Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: ae39697315 [formerly a23c8f2c27] [formerly 729d608a15] [formerly ae39697315 [formerly a23c8f2c27] [formerly 729d608a15] [formerly d54fee5dae [formerly 729d608a15 [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]]
Former-commit-id: d54fee5dae
Former-commit-id: 3b09c69f65 [formerly 67093287a0] [formerly 08cbaa7fb54883ec7360be105a26ab8de2e57993 [formerly 229437773b]]
Former-commit-id: c9048aab5203dfd97a994e794f6e95e3997674d5 [formerly 9ca22fce7f]
Former-commit-id: 8d35f1ce5f
2014-02-27 13:20:49 -06:00
Steve Harris
078b2d659b Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 26959b4fbb [formerly 182c16067c] [formerly 5218a4d1e6] [formerly 26959b4fbb [formerly 182c16067c] [formerly 5218a4d1e6] [formerly 99f53876d7 [formerly 5218a4d1e6 [formerly 2f2339f4c12e1862d27a8dda65264f353aed6ac6]]]]
Former-commit-id: 99f53876d7
Former-commit-id: 01c53daa79 [formerly b8afc0e5f7] [formerly c886e6144ad2cced9b56124b623107c6b77c407f [formerly 0d9abc724c]]
Former-commit-id: dbca9ddc73bb956eca322153c5567ad2d57caa2b [formerly 1c547c6a96]
Former-commit-id: 40e335fdf7
2014-02-27 10:02:43 -06:00