xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4738 commits 31 branches 40 tags 3.8 GiB
Commit graph

4738 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Steffensmeier
ffa4a7a73e Issue #2973 Use correct area for expanding subgrid requests. 
Former-commit-id: 4e60abfd33 [formerly 5b3a8dccbf] [formerly 90f1750691] [formerly 000f259cf4 [formerly 90f1750691 [formerly 3cc81be3ed534aed54bf80b0654f28f7fd86cc8b]]]
Former-commit-id: 000f259cf4
Former-commit-id: f24e95d25af89a1897da1baf888c6a2256e1ca6b [formerly 7b2f82ff30]
Former-commit-id: d52be1875d
 2014-04-04 13:17:36 -05:00
Steve Harris
7caec074e5 Merge branch 'master_14.2.1' (14.2.1-16) into omaha_14.2.1 
Former-commit-id: 8715e0edc8 [formerly 4b96900460] [formerly acd5392e9a] [formerly cb2d69e338 [formerly acd5392e9a [formerly ce1a2d441c1c882209f56fcb82f79edad51ff114]]]
Former-commit-id: cb2d69e338
Former-commit-id: a365a1ace05ee0f5e530a8ec7eccdc5590cc1eca [formerly 09285db2d4]
Former-commit-id: 4e8a672c77
 2014-04-03 13:00:11 -05:00
Ron Anderson
5001c1f2be Issue #2969 Fixed error when Topo parm is unloaded. 
Fixed check state of Topography menu item.

Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b

Former-commit-id: 4bb7f13198 [formerly 346984b8ab] [formerly 11fbd86558] [formerly d556055299 [formerly 11fbd86558 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]]]
Former-commit-id: d556055299
Former-commit-id: dec5605ca65dcc7794d7aa2a917294e93e71160b [formerly ac7c5460f6]
Former-commit-id: 3ac3d5de1b
 2014-04-02 09:07:22 -05:00
Greg Armendariz
65caa7fbec Merge "Issue #2949 Updated scripts Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80" into omaha_14.2.1 
Former-commit-id: 7f46616b73 [formerly 50fb1ec68a] [formerly 6b339bcb86] [formerly 0d0d7bd513 [formerly 6b339bcb86 [formerly 8d8277705568c04ac37bbe8f09bf7f38f2f0521f]]]
Former-commit-id: 0d0d7bd513
Former-commit-id: 5d2be330fd164266561e4522dd2b953d25b27839 [formerly cef70f2168]
Former-commit-id: 380542d2eb
 2014-04-01 19:33:30 -05:00
Richard Peter
e5d60b407e Issue #2509: Fix stitched grid notifications 
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4

Former-commit-id: 9536a08425 [formerly bfba75f73f] [formerly 53d5000261] [formerly f99875040c [formerly 53d5000261 [formerly 861f0c09baa01e191b430bce6699c0f1c95a52d2]]]
Former-commit-id: f99875040c
Former-commit-id: 3bea8ffc56d67fe6dc2c1ddee99339d81e83daf9 [formerly 9ac8af6ccd]
Former-commit-id: b32eff04be
 2014-04-01 14:44:05 -05:00
Dave Hladky
0b5059d6aa Issue #2949 Updated scripts 
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80

Former-commit-id: daa2f2ba43 [formerly 41e43a169b] [formerly 3d6ebf498e] [formerly ede510dd91 [formerly 3d6ebf498e [formerly afcfc72329522c2d731a4afe9353632effb9cb23]]]
Former-commit-id: ede510dd91
Former-commit-id: ef0f92e418f1be10b9211b5d53757234b102506e [formerly be18d1f63c]
Former-commit-id: b202d62214
 2014-04-01 12:33:48 -05:00
David Gillingham
13017ce731 Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1. 
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9

Former-commit-id: d14aee89aa [formerly 402adfeddb] [formerly a529bc8cad] [formerly 70b28b4e1e [formerly a529bc8cad [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]]]
Former-commit-id: 70b28b4e1e
Former-commit-id: a8749ff88e3ad01c4b1fec62d193a19acac4a3ef [formerly 22266d36b9]
Former-commit-id: 64981356c8
 2014-03-31 15:49:33 -05:00
Brian.Dyke
bded86a35f Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1 
Former-commit-id: 7ca114f7f1 [formerly a1b980a15d] [formerly 6346c9776b] [formerly 3b639347f8 [formerly 6346c9776b [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]]
Former-commit-id: 3b639347f8
Former-commit-id: 38694ae3f3f4b7b74544ffa190d887b7c937b26b [formerly 76625c2238]
Former-commit-id: 519ec3071a
 2014-03-27 10:22:26 -04:00
Steve Harris
3b8569a1ac Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1 
Former-commit-id: e621e81f20 [formerly 9cf3600ff6] [formerly 4879520391] [formerly a7efde7cf4 [formerly 4879520391 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]]
Former-commit-id: a7efde7cf4
Former-commit-id: 9e1c5536bf5208e6e617f1b651bab6961954548a [formerly 55440888fd]
Former-commit-id: 311c8d67af
 2014-03-26 15:51:32 -05:00
Brian.Dyke
6476c4fb85 Fixed comment merge conflicts added .gitignore 
Former-commit-id: 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 7cc471a9c9 [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f [formerly d8256c4226]
Former-commit-id: 412a7eb2c2
 2014-03-25 15:41:58 -04:00
Brian.Dyke
5b848e5480 OB_14.1.1-25 baseline 
Former-commit-id: c66bac30c7 [formerly c085bc6879] [formerly c67833407c] [formerly 074abeb0fa [formerly c67833407c [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]
Former-commit-id: 074abeb0fa
Former-commit-id: ec4f283a91b4ae374dc7edc0c06351378f44b61f [formerly 36fdf6bfe4]
Former-commit-id: 95ada25b65
 2014-03-25 13:55:54 -04:00
Richard Peter
5dd2d089bb Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1 
Former-commit-id: d4c67a0f8c [formerly 6236137635] [formerly 390e73af44] [formerly 897980da08 [formerly 390e73af44 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]]]
Former-commit-id: 897980da08
Former-commit-id: d757b784318130cb248a48533db6e16ad9554e32 [formerly 780b504251]
Former-commit-id: a910870531
 2014-03-24 09:53:13 -05:00
Dave Hladky
c978694653 Issue #2939 Madis data mismatches 
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2

Former-commit-id: 912c7e2d12 [formerly 39343e1801] [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 3ac04dd071 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: 52a66b8f177ba3fcebbd8fee9b4e8b300ae9ba10 [formerly 43cbcff538]
Former-commit-id: e464a1d8f8
 2014-03-24 08:27:12 -05:00
Mike Duff
b26be09c49 Issue #2941 - Sort data before returning 
Former-commit-id: d7d06e18fd [formerly ff07b90659] [formerly 73a011b940] [formerly 4db73e42a5 [formerly 73a011b940 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]]]
Former-commit-id: 4db73e42a5
Former-commit-id: c59574ba2d086ee6c90dd15718f0f7b5869fb8e2 [formerly 43eccead7c]
Former-commit-id: 8d1347d1f7
 2014-03-24 08:19:21 -05:00
Brian.Dyke
402035e7f9 Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: 674036b172 [formerly 50e5f4f78d] [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 06ee9a6384 [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: 1a63c19999c01830d72a5d605c2cc1247fc3b4eb [formerly 14567f20a7]
Former-commit-id: d97b88f433
 2014-03-24 07:01:29 -04:00
Brian.Dyke
49f7c81de1 OB_14.1.1-24 baseline 
Former-commit-id: 8366e88db1 [formerly 37e9d48d45] [formerly 37b6368268] [formerly face1ebeeb [formerly 37b6368268 [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]
Former-commit-id: face1ebeeb
Former-commit-id: 96a438276ab6f5a4af7ac304e214e79258c0ea3d [formerly 6b2175da93]
Former-commit-id: cfa058a345
 2014-03-21 12:43:50 -04:00
Ben Steffensmeier
4d284e5780 Issue #2932 improve compatibility of pop skewT and blended resources. 
Former-commit-id: 12d5339c48 [formerly 14907292da] [formerly 933b172ca0] [formerly effb0bfcd8 [formerly 933b172ca0 [formerly 49ffd67e77fef3c76f712cdf0eaa9b5e8ecff737]]]
Former-commit-id: effb0bfcd8
Former-commit-id: 181bf9e15da48dfb7597e793bcef70990b517993 [formerly ee3cb7e69a]
Former-commit-id: 99d9ba9645
 2014-03-20 13:18:40 -05:00
Nate Jensen
0dd42bbdc2 Issue #2919 fix windows error due to gempak library missing 
Former-commit-id: a3220cf170 [formerly 6edec10edc] [formerly 747ac58166] [formerly 82ee3e7104 [formerly 747ac58166 [formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]]]
Former-commit-id: 82ee3e7104
Former-commit-id: 8865ef5c8523a5ad4eab9d7ab74db2f4ee390b98 [formerly 24eadadffd]
Former-commit-id: 07d2a4f40c
 2014-03-20 09:38:07 -05:00
Brian.Dyke
39ef07d49f 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 9c412e444e [formerly d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]
Former-commit-id: 9c412e444e
Former-commit-id: 636e94e2d71aeb03e5b65c5b9c64ecd494fad03f [formerly 88efccf309]
Former-commit-id: 57f7e4b084
 2014-03-14 11:13:30 -04:00
Brian.Dyke
024d49d48b 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 30084d7f84 [formerly 030a18f804 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]]
Former-commit-id: 30084d7f84
Former-commit-id: ef3d48a76a5bbff4e7d32e4ab3916273c583f0ec [formerly 2109409b24]
Former-commit-id: 916fec5a4f
 2014-03-14 10:15:53 -04:00
Brian.Dyke
86ec9a50d4 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 f999e48df0 [formerly d4b6d22ae2 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]
Former-commit-id: f999e48df0
Former-commit-id: 2bdb02ad2c8ccb7c77ded0fd2df41688dea93867 [formerly 3ab2df3507]
Former-commit-id: 82756e3855
 2014-03-14 08:44:39 -04:00
Brian.Dyke
6c021d0eec OB_14.1.1-23 baseline 
Former-commit-id: b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly dcc2e4fd61 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]
Former-commit-id: bc6a7bf946
Former-commit-id: ea51c2c24eabbc975758d2dfad3f260a10c7718d [formerly 8f72db144b]
Former-commit-id: e78e030b7c
 2014-03-14 08:18:16 -04:00
Kevin P. Johnson
54316530e4 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 4c833d3389 [formerly b2797a0788 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]
Former-commit-id: 4c833d3389
Former-commit-id: 6cd2437734cdee7992443a141d1ae3334e20f72d [formerly 17a4229072]
Former-commit-id: 32b372db4b
 2014-03-13 20:42:12 +00:00
Ben Steffensmeier
82a8490dfc Issue #2528 Fix satellite units/style. 
Former-commit-id: eb922ea2e2 [formerly e6cd8b3167] [formerly 77041e5b17] [formerly 75120a09cd [formerly 77041e5b17 [formerly 7e38454a31aa55c606c155a108253c0433ecb517]]]
Former-commit-id: 75120a09cd
Former-commit-id: b6272ae932f2784e4677fe602769adb1fef911b2 [formerly d29daf8ede]
Former-commit-id: e2995114dc
 2014-03-12 14:19:49 -05:00
Richard Peter
90f3b627af Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1 
Former-commit-id: 4d5c7e49f9 [formerly e981ce3e36] [formerly 18234c5d73] [formerly f59d1433db [formerly 18234c5d73 [formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]]]
Former-commit-id: f59d1433db
Former-commit-id: 5f03de8c59b4bb9535d972f40d6cc693c365c3da [formerly 76f15c73dd]
Former-commit-id: cc35481b48
 2014-03-11 16:43:37 -05:00
Dave Hladky
39cc47bc52 Issue #2678 end retrieval double clutching 
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

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

Former-commit-id: 751d8956a9 [formerly e3a3cf7bad] [formerly b0783b64ce] [formerly 187196b519 [formerly b0783b64ce [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]]]
Former-commit-id: 187196b519
Former-commit-id: e949b41e8ce1e7c37f0f510cdbbac24e2438f30d [formerly 68edb8d9a1]
Former-commit-id: 4179172d0e
 2014-03-11 11:54:25 -05:00
Ben Steffensmeier
20b99bc6c5 Issue #2896 Fix sat best res on weird projections 
Former-commit-id: a9c4875038 [formerly c7fa392f3f] [formerly 8bb517836a] [formerly 560fc688bc [formerly 8bb517836a [formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]]]
Former-commit-id: 560fc688bc
Former-commit-id: 3dd12b4d2d8faad952b606b3c39220f5602545d4 [formerly b474e92189]
Former-commit-id: 7a06fdd71a
 2014-03-11 11:07:43 -05:00
Nate Jensen
219f232fcb Issue #2779 update memory settings for renamed NC perspective 
Former-commit-id: ebf5186d75 [formerly 17aa39ce0a] [formerly ccb06db199] [formerly 5eb892f4cf [formerly ccb06db199 [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]]
Former-commit-id: 5eb892f4cf
Former-commit-id: dc64b4c9b5a35e0a38967549f2d086cd34c1fedf [formerly 22ff235bcf]
Former-commit-id: 42c545804c
 2014-03-11 10:28:01 -05:00
Brian.Dyke
a42c10c21d 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 fcc9115b0d [formerly 552490206f [formerly eaa41b4f2dd9fce2d957a2311ee3f4f04f220365]]]
Former-commit-id: fcc9115b0d
Former-commit-id: 96892f7695c369e44e299b4077a8590a12b79541 [formerly 83822661e8]
Former-commit-id: 3070b42ed3
 2014-03-11 10:44:03 -04:00
Juliya Dynina
d1b202fcd0 Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1 
Former-commit-id: 2b55a4240e [formerly b3ec4c363f] [formerly 6bbd88e62c] [formerly 7952862443 [formerly 6bbd88e62c [formerly a167748b77baad66784893304a18e8866f5471f1]]]
Former-commit-id: 7952862443
Former-commit-id: 30b12a7237013355ab82100b5cd40d97cfd766da [formerly 7e35f36651]
Former-commit-id: bedc9082b0
 2014-03-11 09:24:12 -05:00
Brian.Dyke
3667299983 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 4269f9d875 [formerly c6f2010ce6 [formerly 0e02910adc2ef73df2eff5b41c1e9945a5536a0a]]]
Former-commit-id: 4269f9d875
Former-commit-id: 738fc5f415c773f7bde24fd1a60b618f33307d23 [formerly a453d3fd68]
Former-commit-id: c26c40d6e3
 2014-03-10 15:42:38 -04:00
brian.dyke
41a37605d4 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 b1b216f196 [formerly 654778bb0d [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]
Former-commit-id: b1b216f196
Former-commit-id: 9bef04b7d89a16100ee76d159ab4225ead55540a [formerly d57a3dd24c]
Former-commit-id: d1b389ae05
 2014-03-10 15:36:56 -04:00
Brian.Dyke
d197a72c20 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 fda6ab1344 [formerly d710aec521 [formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]]]
Former-commit-id: fda6ab1344
Former-commit-id: 6ec1b00cf64c71cead90fca582edef188ec24710 [formerly 0aff5875b0]
Former-commit-id: c5502af3fa
 2014-03-10 15:14:59 -04:00
Nate Jensen
d32d855bb2 Issue #2779 add .ini generation of memory settings for other components 
Former-commit-id: b77dde280f [formerly 5a88f31a2b] [formerly 6a75fe686a] [formerly d599db4af2 [formerly 6a75fe686a [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]
Former-commit-id: d599db4af2
Former-commit-id: 097c1a455c355cc0ebe8f7b95797516bfc05c8c6 [formerly 5094008bea]
Former-commit-id: 39aa26c2b6
 2014-03-10 10:03:02 -05:00
Stephen Gilbert
803a4584c9 VLab Issue #3224 - NSHARP: Fix erroneous mixing heights 
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2

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

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

Former-commit-id: 78e4214f3d [formerly a7fd09a409] [formerly 1632166902] [formerly 49a6d6ec7e [formerly 1632166902 [formerly 24e07a3215a7879e459afc74e020eab0a8e1c646]]]
Former-commit-id: 49a6d6ec7e
Former-commit-id: cf3ae4ba60186788d49675c04096c67eee23603a [formerly de6e50d8e6]
Former-commit-id: 6d40a42c39
 2014-03-07 18:49:21 -05:00
Stephen Gilbert
b69374b56d 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 6dd6ae8d36 [formerly 625fcb0064 [formerly 4f58998c899e28521658bf17dee852592c534713]]]
Former-commit-id: 6dd6ae8d36
Former-commit-id: 53869af84fd3c1760276c2fccf36acd25767d8aa [formerly 204d047289]
Former-commit-id: ce73240c40
 2014-03-07 18:36:42 -05:00
Steve Harris
a94f800324 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]
Former-commit-id: 4d1fbf8743
 2014-03-07 15:16:18 -06:00
Shawn.Hooper
1acdbf20f2 ASM #224 - WarnGen: OB13.5.2 Template Errors 
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28

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

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

Former-commit-id: fb051c5a5f [formerly b46b87cb5e] [formerly 8c9f9b3ae0] [formerly dc3aadd149 [formerly 8c9f9b3ae0 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]]]
Former-commit-id: dc3aadd149
Former-commit-id: f304d2fa3946f5a199255a03597cdc0f3f79d636 [formerly 05bb380e77]
Former-commit-id: 68d8f9be14
 2014-03-07 12:57:36 -05:00
Brian.Dyke
1f7e61b3df 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 1fe5504d4c [formerly 3ac2a61218 [formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]]]
Former-commit-id: 1fe5504d4c
Former-commit-id: a7d6f4f47c9df94b8ae88988530dc06d80b92b0a [formerly 0c4b9469b0]
Former-commit-id: 48f1f544d6
 2014-03-07 11:50:06 -05:00
David Friedman
951bd668ae ASM #349 - Workaround for QPID-5569 
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce

Former-commit-id: b8aadf1781 [formerly 103fece7b7] [formerly 2c1a3442d6] [formerly a58f3cb7df [formerly 2c1a3442d6 [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]]]
Former-commit-id: a58f3cb7df
Former-commit-id: 38bf85175bedb3976ea85ab928e8bdea8f6e4a64 [formerly 2a4a92c223]
Former-commit-id: 91b22ff9bb
 2014-03-07 14:58:09 +00:00
Brian.Dyke
eb6abe6faa Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: c2449e7821 [formerly a0e3f08fce] [formerly 394076196b] [formerly 7b798ab5d2 [formerly 394076196b [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: e502d460a99724c0ff3efb14c8d0f8d731aad320 [formerly 6ced1bedc2]
Former-commit-id: fa189c0ef6
 2014-03-07 09:01:09 -05:00
Brian.Dyke
50621ec3e5 Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: e1cc8eb59a [formerly 0bbf137b05] [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]
Former-commit-id: 6414bdab57
Former-commit-id: 1e0890d0f70a0aeffbbcabd7f8be3e396daae297 [formerly 2f94480121]
Former-commit-id: 2eec413d72
 2014-03-07 08:57:07 -05:00
Brian.Dyke
3c9cde458a 14.1.1-22 baseline 
Former-commit-id: 1dcc56775d [formerly fe30e1d545] [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly 21f17d4f9b [formerly ae37ad5bac445251d1456f37588819fccfede061]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: f1658f5e11228e084b4f3ed536ccf891c20f621a [formerly a4c136fd60]
Former-commit-id: 9406a1d6c0
 2014-03-07 08:49:00 -05:00
Steve Harris
3715195901 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 93aa41a34b [formerly 3358e8d6ef] [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 7f1ad89df9 [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]
Former-commit-id: a2e36f4c6c
Former-commit-id: 4de1a1cd26a0d873cc898cd411cc38ab4cc889c6 [formerly 8ec20fc5e9]
Former-commit-id: 2371a74a29
 2014-03-06 18:19:55 -06:00