Commit graph

4136 commits

Author SHA1 Message Date
Bryan Kowal
07b0c95cb8 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 49dd7daf05 [formerly 3f4263fa07] [formerly a929dec887] [formerly c13018301e [formerly a929dec887 [formerly b3e74019d1a8550c1c7cbebe219dee3ba7e603b3]]]
Former-commit-id: c13018301e
Former-commit-id: 01f5de1dacc767ea28030a4861c52d252dbd57ba [formerly 0a06af1fdd]
Former-commit-id: f731c424bb
2013-10-14 17:58:22 -05:00
Richard Peter
724c71ccd8 Merge "Issue #2361 fix build" into development
Former-commit-id: 49cb49baba [formerly aab5187185] [formerly b7db7c0c2c] [formerly 5173e00254 [formerly b7db7c0c2c [formerly 29e94325e3b1dbe949051650091854a152800ac9]]]
Former-commit-id: 5173e00254
Former-commit-id: faea6a056b26381e3324a4342bb12db5c77414ca [formerly 250d2fcf37]
Former-commit-id: b55f1f7d35
2013-10-14 16:39:44 -05:00
Nate Jensen
4a555210cc Issue #2361 fix build
Change-Id: I7c93d2be6a04d3414db14e97d0a6a9b2d928ffbd

Former-commit-id: d103e67426 [formerly 2ae2b7faab] [formerly 1e3af0bd1f] [formerly 0adc85a58a [formerly 1e3af0bd1f [formerly d90dae07bd4507c96bb60a4ed372f206aeac74a7]]]
Former-commit-id: 0adc85a58a
Former-commit-id: bdae1a43acecf14bccd2238a2af4062982798c09 [formerly aecb906e82]
Former-commit-id: 45c65ddffd
2013-10-14 16:37:52 -05:00
Nate Jensen
95f1de78e5 Merge "Issue #2386 - DD Front end refactor Peer review comments Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f" into development
Former-commit-id: 2c3d286eb2 [formerly b1d4d2d9ef] [formerly baac431d85] [formerly 23e1817385 [formerly baac431d85 [formerly c3550fa64755f73ee2a23080a0f786a2f170e6ae]]]
Former-commit-id: 23e1817385
Former-commit-id: f7e467ca19c87bc093a0933e116c7732cad75cd7 [formerly 7cdd1071cf]
Former-commit-id: eabc32a720
2013-10-14 16:26:47 -05:00
Richard Peter
37491ee4e2 Merge "Issue #2468 compare DataTime without Calendar. Change-Id: I94f5258d04a53ba77c0e0d7af8637d96dd1ecb59" into development
Former-commit-id: 20ae99b316 [formerly fe606f370e] [formerly 9fa7f87769] [formerly 952f7be167 [formerly 9fa7f87769 [formerly c45932f98cfeb3b4054b8c632e477c6b344590b7]]]
Former-commit-id: 952f7be167
Former-commit-id: 6c02ad235e39a481d264786eff028e259a749bb8 [formerly e656cf1a4c]
Former-commit-id: a0d6c8dd00
2013-10-14 15:43:59 -05:00
Mike Duff
5913f21dd6 Issue #2386 - DD Front end refactor
Peer review comments
Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f

Former-commit-id: 335c8ba871 [formerly 9b4daacb26] [formerly 33a5d36e1c] [formerly 83ec4daee2 [formerly 33a5d36e1c [formerly a72c1f9ad09594ddc0c0e78e78c9fccd95fd49ff]]]
Former-commit-id: 83ec4daee2
Former-commit-id: 177f4fe62912fc601fc1693ee37ceb0e687c8033 [formerly 4764147f67]
Former-commit-id: c4e3b900c9
2013-10-14 15:42:28 -05:00
Ben Steffensmeier
cc521e9742 Issue #2468 compare DataTime without Calendar.
Change-Id: I94f5258d04a53ba77c0e0d7af8637d96dd1ecb59

Former-commit-id: fa304d28a6 [formerly 7901fd821e] [formerly 27758e3e7f] [formerly 88d9dd4a9d [formerly 27758e3e7f [formerly c988286b20545bbe7e7dab3d717ebd7f78968048]]]
Former-commit-id: 88d9dd4a9d
Former-commit-id: 562cd76a49db8306a459ab71be58664e0374fd7b [formerly 18b8371f4c]
Former-commit-id: 1e6fe1a4ef
2013-10-14 15:37:25 -05:00
Nate Jensen
9d1df167be Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: 2fb28dce46 [formerly d7e4576380] [formerly b49a2ceb2f] [formerly 40847d0edf [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]]
Former-commit-id: 40847d0edf
Former-commit-id: 354b93b5a9315917fe3ed51f812147bc484eb332 [formerly 9e4100b0e1]
Former-commit-id: d84f47b609
2013-10-14 15:30:09 -05:00
Lee Venable
bdbbcbb36a Issue #2474 - Fixed font memory leak.
Former-commit-id: 4d3e1ef28c [formerly 7defe1efea] [formerly a9b8c2a2fe] [formerly f3a9e541a1 [formerly a9b8c2a2fe [formerly a8a78efd01f8f3ed0ee533d4eeeb9e3463d3c0f2]]]
Former-commit-id: f3a9e541a1
Former-commit-id: 6f2af17028bd11945c433b0da741649b7233a683 [formerly 36176665ff]
Former-commit-id: 87e40ae6b1
2013-10-14 12:42:27 -05:00
Ben Steffensmeier
cd2ad3dd0b Issue #2402 Drop grib split to one thread, remove LargeGribFile from ISerializeableObject file.
Former-commit-id: dcf275dbc3 [formerly 75cef40e49] [formerly cb37bc8e38] [formerly afe18f40e6 [formerly cb37bc8e38 [formerly 0b0476bf4df65366fb4bfe8cbead30dde1620054]]]
Former-commit-id: afe18f40e6
Former-commit-id: c06cadf8da2180a759be6d6815884e1dec901ed4 [formerly 66d74b3884]
Former-commit-id: 1f68a68d02
2013-10-14 11:46:57 -05:00
Nate Jensen
0059665def Merge "Issue #2441 Initialize python interpreter asynchronously when opening localization perspective." into development
Former-commit-id: d8bd120a11 [formerly b328e8dec5] [formerly 96463c6117296ffe71df938350471c29d4b82158 [formerly abf2fa50b7]] [formerly 93c67d2d8c [formerly abf2fa50b7 [formerly 97ac5b996bc54d949f03e6ea0f0952207e10366c]]]
Former-commit-id: 93c67d2d8c
Former-commit-id: 45e15e042c739b95e6ced767efd83fd862f635d1 [formerly 85af27444f]
Former-commit-id: 48445dd8cf
2013-10-14 11:42:23 -05:00
Nate Jensen
8442503010 Merge "Issue #2333 Removed more unused fields from satellite record" into development
Former-commit-id: 72cea9a79b [formerly d60c08024f] [formerly 01b534fc5a] [formerly b9cf1a6533 [formerly 01b534fc5a [formerly 49ba8c831ec6318b82d66372c8370b97070733dd]]]
Former-commit-id: b9cf1a6533
Former-commit-id: 6b0133f62a6a2ded3efd1d24e3d4f04b8fb13933 [formerly 480acfddfb]
Former-commit-id: 89a7c7a4fe
2013-10-14 11:41:45 -05:00
Richard Peter
e13d9f0fed Merge "Issue #2402 Remove excessive grid point count output." into development
Former-commit-id: 2dec51d9b8 [formerly fa3d3ad219] [formerly 8466d69993] [formerly ac61eedd88 [formerly 8466d69993 [formerly ef68e9c3459e1e1cf40b433e05e0c6beea5f18e0]]]
Former-commit-id: ac61eedd88
Former-commit-id: 6c2bcc48209bc3015608c9d5046e2c3b60853106 [formerly 3af222d8da]
Former-commit-id: fdef1c8039
2013-10-14 11:16:03 -05:00
Richard Peter
6a0020cf1c Merge "Issue #2386 - Implement the front end for multiple data type overlap rules Peer review comments" into development
Former-commit-id: e1ba2afa4c [formerly 1f772816de] [formerly d8b49516dc] [formerly c056c93104 [formerly d8b49516dc [formerly 581cc8e7319216c910e71936820f7414d2281fed]]]
Former-commit-id: c056c93104
Former-commit-id: 5a35bd165eea54bab27de852d18ba49301eed727 [formerly eb1ed4cda6]
Former-commit-id: b6d6458ab2
2013-10-14 11:15:40 -05:00
Ben Steffensmeier
096ff46a78 Issue #2402 Remove excessive grid point count output.
Former-commit-id: 70416f3d59 [formerly 944aee22c9] [formerly a42c0654f5] [formerly f290019e64 [formerly a42c0654f5 [formerly 4c25d75411a8c28cc2a2511c8d3a4876eaaa7be4]]]
Former-commit-id: f290019e64
Former-commit-id: ecc7464ebaf80387216a12b10848191a76c2b320 [formerly 18e33cba9d]
Former-commit-id: bc215e7276
2013-10-14 11:13:03 -05:00
Steve Harris
cc5e19f181 Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: d455ad79ce [formerly 1581adfa64] [formerly 852c02c848] [formerly 545d7ca463 [formerly 852c02c848 [formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]]]
Former-commit-id: 545d7ca463
Former-commit-id: 519ff37a80328281e8c99f985371e3ec85b3bee0 [formerly 5cf3cc1efc]
Former-commit-id: 2f0968a279
2013-10-14 09:28:24 -05:00
Greg Armendariz
dd365e604a Merge "Issue #2297 - fix 14.2.1 qpid build" into development
Former-commit-id: b379f7d077 [formerly 14d90768e0] [formerly aa0d3bdab4] [formerly 01a1ada89b [formerly aa0d3bdab4 [formerly 6a11a118261a0cbad93933d99d6a89187c831a02]]]
Former-commit-id: 01a1ada89b
Former-commit-id: 5a79b44b0bb7fd3c3b1aa9bf3c9a3731094ee598 [formerly 0d066c50cd]
Former-commit-id: f53973e153
2013-10-14 09:08:05 -05:00
Steve Harris
99dac05b85 13.5.2-10 baseline
Former-commit-id: 2f59153a18 [formerly 1efbba7a4b] [formerly 46c351de6c] [formerly c3d29c0fa0 [formerly 46c351de6c [formerly 83863a9833f309203af0ee34d503bf280e596397]]]
Former-commit-id: c3d29c0fa0
Former-commit-id: 908adf82a3e2b56f5c1b086392c40f7024701459 [formerly 5f86804c81]
Former-commit-id: d1f38eb936
2013-10-14 09:59:31 -04:00
Mike Duff
27fd5ba0fa Issue #2386 - Implement the front end for multiple data type overlap rules
Peer review comments

Change-Id: I1f0186b3e08f3013a6dc4dc3dbf7c2e0a19404bf

Former-commit-id: 10f3fa86b0 [formerly c4e501aaf9] [formerly a220ff05b0] [formerly a69120c623 [formerly a220ff05b0 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]]]
Former-commit-id: a69120c623
Former-commit-id: 5c24818dd9e96881368fc526e9d32dce344061c7 [formerly f9074dc896]
Former-commit-id: 610c937a00
2013-10-11 18:18:18 -05:00
Ben Steffensmeier
44613a0c61 Issue #2441 Initialize python interpreter asynchronously when opening localization perspective.
Former-commit-id: a1fe58b934 [formerly ccf8a88f17] [formerly 89eb327bf0] [formerly c5d49b2a4c [formerly 89eb327bf0 [formerly 7d9312fbedf734f973401e21445448646ff67410]]]
Former-commit-id: c5d49b2a4c
Former-commit-id: 5b606b351636990de687695ed10f65eb3cc717ee [formerly c38c7d654c]
Former-commit-id: ae94d39ce2
2013-10-11 16:25:28 -05:00
Max Schenkelberg
f28272fa6e Issue #2333 Removed more unused fields from satellite record
Change-Id: I02ec3ff328606673d717c31e583c2679389e87ec

Former-commit-id: f34750cb5f [formerly 3c2492cdbe] [formerly b68b8de21b] [formerly 8fddd5a57b [formerly b68b8de21b [formerly 91c5da670e6b23814532b473c93237744398369d]]]
Former-commit-id: 8fddd5a57b
Former-commit-id: f41b2ac789434c1654f92e97b783cd78ec044300 [formerly 3b53d18be4]
Former-commit-id: 9bd27e3c43
2013-10-11 16:17:52 -05:00
Richard Peter
d3598aaffb Merge "Issue #2402 Make grib large grid handling more dynamic. Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d" into development
Former-commit-id: 0a802a9218 [formerly ea74adff8f] [formerly a99e286c0f] [formerly dba525c5e6 [formerly a99e286c0f [formerly f0ab566352660170b71b46f6517e371d42f973df]]]
Former-commit-id: dba525c5e6
Former-commit-id: eba7342fd247b0069dd81a78c0141f3af11af599 [formerly 2d1963c665]
Former-commit-id: 6dbdecfb9a
2013-10-11 15:34:31 -05:00
Nate Jensen
547cc917ea Merge "Issue #2333 Updated upgrade script to only run against entries in satellite_spatial that have not already been updated. This is so the upgrade script won't break the satellite data if it has already been ran" into development
Former-commit-id: e11a93f252 [formerly 2a069e8cf2] [formerly 88f83a842e] [formerly 1b2024a69d [formerly 88f83a842e [formerly 2de15863597a3fc86ff11415de9c1bbec26b12e8]]]
Former-commit-id: 1b2024a69d
Former-commit-id: 64d696225d49028fd5a65de790c4db9d545f6e7b [formerly e5b854964d]
Former-commit-id: 475050f32d
2013-10-11 15:33:42 -05:00
Ben Steffensmeier
46e676c816 Issue #2402 Make grib large grid handling more dynamic.
Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d

Former-commit-id: 38ac706b80 [formerly 2de4562585] [formerly 3fd473e25d] [formerly 0ecab8d44e [formerly 3fd473e25d [formerly bec1391240d3bf2ac0da4e8b29ae6ce3985e3d32]]]
Former-commit-id: 0ecab8d44e
Former-commit-id: bd8e77a0c857b6855c5e1bd662bfd797af1e0932 [formerly 78b278e4ef]
Former-commit-id: 0a125ce17b
2013-10-11 15:22:32 -05:00
Max Schenkelberg
f8795885f5 Issue #2081 Fixed null pointer in DataURIUtil
Change-Id: Ic052c0d12e51949568bb5540ab97b1e0091ca231

Former-commit-id: 5cecf2a1d6 [formerly 8e1a0cb397] [formerly 6f0d8eb4c56b8a599bcfb21b7b4597008c636cb0 [formerly 819df41147]] [formerly 67bfa28850 [formerly 819df41147 [formerly ab9174cac744785588c49237fde5cb497fb09d0f]]]
Former-commit-id: 67bfa28850
Former-commit-id: f3c95fbb85e13f19cb86ae341c6d8e60d4b3c216 [formerly 50fd97a5d5]
Former-commit-id: fe93c69429
2013-10-11 14:29:11 -05:00
Lee Venable
ca1a404c58 Merge "Issue #2471 - fixed color memory leak." into development
Former-commit-id: 64b05d759b [formerly 16e5a0223a] [formerly 3b98dc699c] [formerly 06a38bd123 [formerly 3b98dc699c [formerly 1cb4839c1115ff4e65dcfd27377f81af7795ddd0]]]
Former-commit-id: 06a38bd123
Former-commit-id: 4bec7eb59e1ff363c471cbf14905ea948580bf90 [formerly 82556ab7ec]
Former-commit-id: 3e95f8feb8
2013-10-11 13:02:35 -05:00
Max Schenkelberg
0b80a9f69a Issue #2333 Updated upgrade script to only run against entries in satellite_spatial that have not already been updated. This is so the upgrade script won't break the satellite data if it has already been ran
Change-Id: Ibe2206e584e89a40d4cdd1a2b50e91e10c885ae0

Former-commit-id: a0abc34322 [formerly 06603cabe5] [formerly fbc06d81f7] [formerly 41b6f79c52 [formerly fbc06d81f7 [formerly 2957c9c40fe85cbe5bd90c5f6444fce1f9ffdcf1]]]
Former-commit-id: 41b6f79c52
Former-commit-id: 2d15674f89c9b59567e7509f08ac8ada299b6ac8 [formerly dd99767050]
Former-commit-id: 3aa9f8cc42
2013-10-11 12:14:21 -05:00
Nate Jensen
d3e361eaa4 Merge "Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104." into development
Former-commit-id: 568e5bd9f6 [formerly c6c2f50562] [formerly 8208d756c7] [formerly d5d0fab53b [formerly 8208d756c7 [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]]
Former-commit-id: d5d0fab53b
Former-commit-id: bed476bf2460c8360b48e732fa9f1b178615b422 [formerly a34777a738]
Former-commit-id: fd3a19a73c
2013-10-11 11:21:18 -05:00
Lee Venable
ffe192037c Issue #2471 - fixed color memory leak.
Former-commit-id: 0cadf82e88 [formerly 97b3c7af6b] [formerly bceb4d76bf] [formerly 61e5d5e4da [formerly bceb4d76bf [formerly a573bacadd4d9b3ea0058bb70b348372b6a21cc9]]]
Former-commit-id: 61e5d5e4da
Former-commit-id: 1e2a3f588e15979f96d0306e26a250a064445b33 [formerly 107b35761b]
Former-commit-id: cec4aecdaa
2013-10-11 11:09:57 -05:00
Brad Gonzales
ff0ec3ddc6 Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
       Fix GriddedTime addCycles when cycles are empty.

Change-Id: I9fa27178e5f59252cb872314493256be7f038890

Former-commit-id: 718fea35a1 [formerly ac3d87c397] [formerly 25710edd9e] [formerly bc87f2a168 [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]]
Former-commit-id: bc87f2a168
Former-commit-id: 80e942a0903682ada751fb617334acdf3cd8b6d9 [formerly 897fdfc2f6]
Former-commit-id: 5825fa41d6
2013-10-11 10:36:53 -05:00
Max Schenkelberg
98b60f0050 Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104.
Amend: Accepted ticket, cleanup, comments

Change-Id: I78649dd0268b030624888544740a8d7af3e83e97

Former-commit-id: c2471fd381 [formerly b64050ff1e] [formerly 7a66a3c995] [formerly 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]]
Former-commit-id: 01c0e022d5
Former-commit-id: d2fa57de0fb4cdcad01f1ef6e1a474065d10bc48 [formerly cf0ad44ee3]
Former-commit-id: dfd6ffabd8
2013-10-11 10:21:37 -05:00
Ron Anderson
fd4a1ff6d3 Merge "Issue #2361 fix iscUtil" into development
Former-commit-id: fe072b8a46 [formerly 1d74ec7b95] [formerly 3e260a58d9] [formerly 584a782545 [formerly 3e260a58d9 [formerly 52834c2c4a82218588f2725c3ea12c4ce8e3dc14]]]
Former-commit-id: 584a782545
Former-commit-id: 82f9833f21f1dafefc410114667acf49e4900722 [formerly d13c6943da]
Former-commit-id: e421c4c24f
2013-10-10 18:03:36 -05:00
Nate Jensen
75447a2206 Merge "Issue #2376 Fix STI parsing Change-Id: Ifcf0829f187a2fb96258cb3706e52bb1ba725fe5" into development
Former-commit-id: 6a4a5789f8 [formerly d410323a97] [formerly baac824e68] [formerly 3dbf65f001 [formerly baac824e68 [formerly dfe0380de11634362922e9194e7a2f7e915a1445]]]
Former-commit-id: 3dbf65f001
Former-commit-id: 397ba345eb6a3098f62b78a3cc7d6948c4e6f75a [formerly 117fd8377a]
Former-commit-id: 690ec74226
2013-10-10 17:38:22 -05:00
Nate Jensen
d3e0340f3d Issue #2361 fix iscUtil
Change-Id: I4f62e048db3c1b453f56ece98448e1cf8b35fc28

Former-commit-id: 9061866d58 [formerly fa2a7db710] [formerly 8aecb21306] [formerly dc60f94a34 [formerly 8aecb21306 [formerly 93ec0db0ac9adeab663fa18f2d93eb9a42e4302b]]]
Former-commit-id: dc60f94a34
Former-commit-id: 4f809ea030f0b5f024efb499a22c552717e6efbe [formerly ef92804824]
Former-commit-id: a75c66778b
2013-10-10 17:38:01 -05:00
Ben Steffensmeier
babdf64cc4 Issue #2376 Fix STI parsing
Change-Id: Ifcf0829f187a2fb96258cb3706e52bb1ba725fe5

Former-commit-id: 0f77e750f6 [formerly 29f3ac17f1] [formerly abf0df45c4] [formerly f1699b1d62 [formerly abf0df45c4 [formerly 4af47a67091e0249c01289f275d44756f04e50d3]]]
Former-commit-id: f1699b1d62
Former-commit-id: 0792017648e0b6674aed4c03b8d36b760d6405c7 [formerly 5abf856ccb]
Former-commit-id: 9066930aec
2013-10-10 15:47:54 -05:00
Lee Venable
2174aea7fc Merge "Issue #2464 - fixed font memory leak." into development
Former-commit-id: 442865a5f3 [formerly e337b90ba5] [formerly 3a611d3f4f] [formerly feb40aada0 [formerly 3a611d3f4f [formerly 5765e3fb4ee0f7305e5ec6240caeec375dd985a9]]]
Former-commit-id: feb40aada0
Former-commit-id: e25d2128e67f303ef6dec71f641474d70e4d5040 [formerly dc31709252]
Former-commit-id: 93b93a6750
2013-10-10 15:29:28 -05:00
Lee Venable
1fa0a9e763 Merge "Issue #2428. Fixed memory leak for Regions" into development
Former-commit-id: e2cb973876 [formerly 10c5920b90] [formerly aa27b764ca] [formerly 6282814c91 [formerly aa27b764ca [formerly 29dd5dbf962cace42e38999f075aaaa57e24f3fc]]]
Former-commit-id: 6282814c91
Former-commit-id: 93a1856b5ba4c4002a11e6208f64b92373243999 [formerly fb37fddffa]
Former-commit-id: 00f14ba5da
2013-10-10 15:26:04 -05:00
Nate Jensen
b3a270b699 Merge "Issue #2361 remove ISerializableObject for hydro colors" into development
Former-commit-id: 9edf04647a [formerly 59e0414d4d] [formerly 7ca0f9a251] [formerly c6a8eaa841 [formerly 7ca0f9a251 [formerly 25c12b40a85db7a4e968dccb57798aaacb089b64]]]
Former-commit-id: c6a8eaa841
Former-commit-id: e7fcbe3bbb07cea6cb476be72d6239106fca7335 [formerly 81d1faa5d4]
Former-commit-id: 8f686c0d94
2013-10-10 15:07:34 -05:00
Slav Korolev
74fb9bb36c Issue #2428. Fixed memory leak for Regions
Former-commit-id: 2b29184b21 [formerly 2c4730db16] [formerly cab603ba36] [formerly 0021d53557 [formerly cab603ba36 [formerly 899d1f6371d55056af747d8bf6dee99d0c4179c9]]]
Former-commit-id: 0021d53557
Former-commit-id: 14b3866029e9725abb0c7991b69a2bf28a11dd22 [formerly 3631bfbeba]
Former-commit-id: bd225735ff
2013-10-10 14:09:37 -04:00
Bryan Kowal
ccf1f7845b Issue #2402 - re-compile 32-bit grib2.so
Former-commit-id: 9f5cbcda14 [formerly 410b9b6669] [formerly 05954f89b8] [formerly 3eee9edb58 [formerly 05954f89b8 [formerly e70561d259082645390f95df823ad4583aea8bbe]]]
Former-commit-id: 3eee9edb58
Former-commit-id: d95dd19e8bd4fae3a668ab9aa814a42776b4fcb3 [formerly c7381d7ce2]
Former-commit-id: c79a66452b
2013-10-10 12:49:49 -05:00
Richard Peter
7dc72f9bba Merge "Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes." into development
Former-commit-id: a4b1eb9dff [formerly e717ae510b] [formerly 8f67035519] [formerly d7db5d0219 [formerly 8f67035519 [formerly 3a704d8d903afc5629a13f478af585947954b5d2]]]
Former-commit-id: d7db5d0219
Former-commit-id: 68223945005706fda2640591654c8d7d4815f98e [formerly 6eae16a7dc]
Former-commit-id: 3fec426da2
2013-10-10 11:34:11 -05:00
Bryan Kowal
ef3865e22a Issue #2297 - fix 14.2.1 qpid build
Former-commit-id: 886e5f2370 [formerly a8dfd1ef01] [formerly 9d7ad6908a] [formerly 584d8b2ae4 [formerly 9d7ad6908a [formerly 7863a68ae1c67188450ab7c3a9cc2c912533300c]]]
Former-commit-id: 584d8b2ae4
Former-commit-id: 032a9246c93b9f11150b7297e5f79e85cb21b868 [formerly be0d60134b]
Former-commit-id: a4ea738a10
2013-10-10 11:21:11 -05:00
Richard Peter
d791e5c640 Merge "Issue #2466 Returned to original harvesterThreadPool Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d" into development
Former-commit-id: 8ed2c3a117 [formerly f03832c79b] [formerly a3e361323c] [formerly fde5182264 [formerly a3e361323c [formerly 2d49ceead68df56e96c38652ab1c7df543f0f6d5]]]
Former-commit-id: fde5182264
Former-commit-id: ae58cf5f06a38fa19ac868fb2cea93fba494a9a4 [formerly 825b01404e]
Former-commit-id: ab702730a1
2013-10-10 11:05:45 -05:00
Nate Jensen
4454f61a27 Issue #2361 remove ISerializableObject for hydro colors
Change-Id: Icc4a1e2ebff06ff389e95563406176663000ad7c

Former-commit-id: 54a13cef30 [formerly 472c2693c4] [formerly 0fe5979eac] [formerly 83fafc638b [formerly 0fe5979eac [formerly f23474913e08b34d1eb82e2106549f57fd36538c]]]
Former-commit-id: 83fafc638b
Former-commit-id: 67c022fe0bf860e2b4d22e1b1209c2a4000de21f [formerly 7fb250b184]
Former-commit-id: 91ddf05a6b
2013-10-10 10:57:59 -05:00
Dave Hladky
e4d7d2d8c1 Issue #2466 Returned to original harvesterThreadPool
Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d

Former-commit-id: 843f83e4a4 [formerly 36667033b2] [formerly 38a6b4e811] [formerly e6931e8454 [formerly 38a6b4e811 [formerly 26316e71831c51e3ee96a1afd9ef213f1d87beff]]]
Former-commit-id: e6931e8454
Former-commit-id: 51ee30687642864aed2161fc719cf2fd1f327376 [formerly 750b8aa13e]
Former-commit-id: edec7221f4
2013-10-10 10:47:44 -05:00
Nate Jensen
b726353f42 Merge "Issue #2361 remove ISerializableObject for some pointdata and user roles classes" into development
Former-commit-id: 038f48e28f [formerly 55d1d12c38] [formerly b3fdf129db] [formerly 2934222c09 [formerly b3fdf129db [formerly 7a2dd6ccb98c9b7b28b989835b6ed6535f7a6ce1]]]
Former-commit-id: 2934222c09
Former-commit-id: 71820d3260124a01642944c128826c4f9ea4e3b9 [formerly ed0c5355c5]
Former-commit-id: 2c9dcd242b
2013-10-10 10:09:46 -05:00
Bryan Kowal
331115a9e5 Fix Merge Issue.
Former-commit-id: 66eb9a1983 [formerly 62db4d7b07] [formerly 21df04ff39] [formerly db25d33a4d [formerly 21df04ff39 [formerly 91716e4f6eb81153afa48266cdd43e3239864301]]]
Former-commit-id: db25d33a4d
Former-commit-id: f179478893abf5c2314388f9c1627b156e2a7ac8 [formerly 1263d95220]
Former-commit-id: e130d1ce58
2013-10-10 10:04:26 -05:00
Steve Harris
13873d55c2 13.5.2-9 baseline
Former-commit-id: 0093ce47a8 [formerly fdbef0e663] [formerly a28a2d3041] [formerly f36cf09d21 [formerly a28a2d3041 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]
Former-commit-id: f36cf09d21
Former-commit-id: 9c502fedcbd501781ba7a8be644ea45c55cc5e52 [formerly 45c58e1cb3]
Former-commit-id: 7d0416293f
2013-10-10 10:55:20 -04:00
Lee Venable
6ac2e88aee Issue #2464 - fixed font memory leak.
Former-commit-id: 9c8d1471db [formerly e3f44d751a] [formerly 1a693c5d35] [formerly e1adc2e4be [formerly 1a693c5d35 [formerly eceb0ab9c7ddc0d28d5452d9bf77888b9e58a9ac]]]
Former-commit-id: e1adc2e4be
Former-commit-id: 5904fc15c7ce1db3e764a1a7c740a0ecbbe10705 [formerly b98e10fe06]
Former-commit-id: 1b9ed84e9c
2013-10-10 09:48:55 -05:00
Slav Korolev
a1e3716076 Issue #2427. Fixed memory leak for images
Former-commit-id: 815b2fb40d [formerly 5dcf4a00bc] [formerly c91df51c728a2df7e57ff49ccc29634b41c359b5 [formerly 012497bfef]] [formerly f0aba7be10 [formerly 012497bfef [formerly 770bfd43e07cd92c2c8a3d7b3d1a07eb6d8b1052]]]
Former-commit-id: f0aba7be10
Former-commit-id: 6d12d9ebc42f69dee6fac7843780d975a33617b7 [formerly 0b08d2bb0e]
Former-commit-id: 09f00e1d81
2013-10-10 09:34:24 -04:00