Max Schenkelberg
|
2e77b6bdb9
|
Issue #2333 Removed more unused fields from satellite record
Change-Id: I02ec3ff328606673d717c31e583c2679389e87ec
Former-commit-id: f34750cb5f [formerly 3c2492cdbe] [formerly b68b8de21b] [formerly f34750cb5f [formerly 3c2492cdbe] [formerly b68b8de21b] [formerly 8fddd5a57b [formerly b68b8de21b [formerly 91c5da670e6b23814532b473c93237744398369d]]]]
Former-commit-id: 8fddd5a57b
Former-commit-id: f28272fa6e [formerly 9bd27e3c43] [formerly f41b2ac789434c1654f92e97b783cd78ec044300 [formerly 3b53d18be4]]
Former-commit-id: dd7ba2c0ac1354ae9cfc967b5ccd480daaad4e5f [formerly 67491d2af0]
Former-commit-id: 2bc44908ff
|
2013-10-11 16:17:52 -05:00 |
|
Richard Peter
|
cfc194f270
|
Merge "Issue #2402 Make grib large grid handling more dynamic. Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d" into development
Former-commit-id: 0a802a9218 [formerly ea74adff8f] [formerly a99e286c0f] [formerly 0a802a9218 [formerly ea74adff8f] [formerly a99e286c0f] [formerly dba525c5e6 [formerly a99e286c0f [formerly f0ab566352660170b71b46f6517e371d42f973df]]]]
Former-commit-id: dba525c5e6
Former-commit-id: d3598aaffb [formerly 6dbdecfb9a] [formerly eba7342fd247b0069dd81a78c0141f3af11af599 [formerly 2d1963c665]]
Former-commit-id: fed529049b0cde68d4db324452ff2a38969a6783 [formerly 14df7cc0c1]
Former-commit-id: bdc7d9e7d8
|
2013-10-11 15:34:31 -05:00 |
|
Nate Jensen
|
5d0190d1db
|
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 e11a93f252 [formerly 2a069e8cf2] [formerly 88f83a842e] [formerly 1b2024a69d [formerly 88f83a842e [formerly 2de15863597a3fc86ff11415de9c1bbec26b12e8]]]]
Former-commit-id: 1b2024a69d
Former-commit-id: 547cc917ea [formerly 475050f32d] [formerly 64d696225d49028fd5a65de790c4db9d545f6e7b [formerly e5b854964d]]
Former-commit-id: 3a2596d27278f82066d36356773d26ef9a5eabe6 [formerly 327bb053af]
Former-commit-id: 6a0d7c3e88
|
2013-10-11 15:33:42 -05:00 |
|
Ben Steffensmeier
|
a5b8118b3c
|
Issue #2402 Make grib large grid handling more dynamic.
Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d
Former-commit-id: 38ac706b80 [formerly 2de4562585] [formerly 3fd473e25d] [formerly 38ac706b80 [formerly 2de4562585] [formerly 3fd473e25d] [formerly 0ecab8d44e [formerly 3fd473e25d [formerly bec1391240d3bf2ac0da4e8b29ae6ce3985e3d32]]]]
Former-commit-id: 0ecab8d44e
Former-commit-id: 46e676c816 [formerly 0a125ce17b] [formerly bd8e77a0c857b6855c5e1bd662bfd797af1e0932 [formerly 78b278e4ef]]
Former-commit-id: 42f20bfbf1bf91b7d11aa8c27b6275d438752828 [formerly 3f554d680f]
Former-commit-id: fb0f53feb8
|
2013-10-11 15:22:32 -05:00 |
|
Max Schenkelberg
|
47fa5c9a49
|
Issue #2081 Fixed null pointer in DataURIUtil
Change-Id: Ic052c0d12e51949568bb5540ab97b1e0091ca231
Former-commit-id: 5cecf2a1d6 [formerly 8e1a0cb397] [formerly 819df41147] [formerly 5cecf2a1d6 [formerly 8e1a0cb397] [formerly 819df41147] [formerly 67bfa28850 [formerly 819df41147 [formerly ab9174cac744785588c49237fde5cb497fb09d0f]]]]
Former-commit-id: 67bfa28850
Former-commit-id: f8795885f5 [formerly fe93c69429] [formerly f3c95fbb85e13f19cb86ae341c6d8e60d4b3c216 [formerly 50fd97a5d5]]
Former-commit-id: 5763e7d2f08d06cf22dde76f06aea16ac83f7c26 [formerly e8be0b3728]
Former-commit-id: 99d63398a3
|
2013-10-11 14:29:11 -05:00 |
|
Lee Venable
|
a52447c65a
|
Merge "Issue #2471 - fixed color memory leak." into development
Former-commit-id: 64b05d759b [formerly 16e5a0223a] [formerly 3b98dc699c] [formerly 64b05d759b [formerly 16e5a0223a] [formerly 3b98dc699c] [formerly 06a38bd123 [formerly 3b98dc699c [formerly 1cb4839c1115ff4e65dcfd27377f81af7795ddd0]]]]
Former-commit-id: 06a38bd123
Former-commit-id: ca1a404c58 [formerly 3e95f8feb8] [formerly 4bec7eb59e1ff363c471cbf14905ea948580bf90 [formerly 82556ab7ec]]
Former-commit-id: 139e0f8cc5c19de048741f3e8e26f3bf9abee324 [formerly 34b2bbc487]
Former-commit-id: 913b363cc9
|
2013-10-11 13:02:35 -05:00 |
|
Max Schenkelberg
|
332c2d91a1
|
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 a0abc34322 [formerly 06603cabe5] [formerly fbc06d81f7] [formerly 41b6f79c52 [formerly fbc06d81f7 [formerly 2957c9c40fe85cbe5bd90c5f6444fce1f9ffdcf1]]]]
Former-commit-id: 41b6f79c52
Former-commit-id: 0b80a9f69a [formerly 3aa9f8cc42] [formerly 2d15674f89c9b59567e7509f08ac8ada299b6ac8 [formerly dd99767050]]
Former-commit-id: 68356d2d826fc2f0b0e93b5ab0c894325565c849 [formerly 239d0e52ea]
Former-commit-id: 11980c92ae
|
2013-10-11 12:14:21 -05:00 |
|
Nate Jensen
|
445acd4997
|
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 568e5bd9f6 [formerly c6c2f50562] [formerly 8208d756c7] [formerly d5d0fab53b [formerly 8208d756c7 [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]]]
Former-commit-id: d5d0fab53b
Former-commit-id: d3e361eaa4 [formerly fd3a19a73c] [formerly bed476bf2460c8360b48e732fa9f1b178615b422 [formerly a34777a738]]
Former-commit-id: 14d624993f388eb4c6ef74658886d48d65a93bf0 [formerly 184d23719b]
Former-commit-id: a6535a0494
|
2013-10-11 11:21:18 -05:00 |
|
Lee Venable
|
27e147ce0a
|
Issue #2471 - fixed color memory leak.
Former-commit-id: 0cadf82e88 [formerly 97b3c7af6b] [formerly bceb4d76bf] [formerly 0cadf82e88 [formerly 97b3c7af6b] [formerly bceb4d76bf] [formerly 61e5d5e4da [formerly bceb4d76bf [formerly a573bacadd4d9b3ea0058bb70b348372b6a21cc9]]]]
Former-commit-id: 61e5d5e4da
Former-commit-id: ffe192037c [formerly cec4aecdaa] [formerly 1e2a3f588e15979f96d0306e26a250a064445b33 [formerly 107b35761b]]
Former-commit-id: af9d2a5d5c5d15fce00cc7930b6e73f84902150c [formerly 7335826e3f]
Former-commit-id: 98baa074a2
|
2013-10-11 11:09:57 -05:00 |
|
Brad Gonzales
|
c49808a723
|
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 718fea35a1 [formerly ac3d87c397] [formerly 25710edd9e] [formerly bc87f2a168 [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]]]
Former-commit-id: bc87f2a168
Former-commit-id: ff0ec3ddc6 [formerly 5825fa41d6] [formerly 80e942a0903682ada751fb617334acdf3cd8b6d9 [formerly 897fdfc2f6]]
Former-commit-id: 0feb323650cbcacede4cba0bae1d36a86174332f [formerly 32dce367a9]
Former-commit-id: feef0a0b55
|
2013-10-11 10:36:53 -05:00 |
|
Max Schenkelberg
|
de1a256c47
|
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 c2471fd381 [formerly b64050ff1e] [formerly 7a66a3c995] [formerly 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]]]
Former-commit-id: 01c0e022d5
Former-commit-id: 98b60f0050 [formerly dfd6ffabd8] [formerly d2fa57de0fb4cdcad01f1ef6e1a474065d10bc48 [formerly cf0ad44ee3]]
Former-commit-id: 483819660d2cb4b6cc4872b4a95029a3370fc251 [formerly 3c2f370688]
Former-commit-id: a9a73d12cb
|
2013-10-11 10:21:37 -05:00 |
|
Ron Anderson
|
42b1ed9e94
|
Merge "Issue #2361 fix iscUtil" into development
Former-commit-id: fe072b8a46 [formerly 1d74ec7b95] [formerly 3e260a58d9] [formerly fe072b8a46 [formerly 1d74ec7b95] [formerly 3e260a58d9] [formerly 584a782545 [formerly 3e260a58d9 [formerly 52834c2c4a82218588f2725c3ea12c4ce8e3dc14]]]]
Former-commit-id: 584a782545
Former-commit-id: fd4a1ff6d3 [formerly e421c4c24f] [formerly 82f9833f21f1dafefc410114667acf49e4900722 [formerly d13c6943da]]
Former-commit-id: 1f70048c8a9b07c91ed012d8994bccf6842845fb [formerly 5b87108b39]
Former-commit-id: 846b12a916
|
2013-10-10 18:03:36 -05:00 |
|
Nate Jensen
|
9f138b378f
|
Merge "Issue #2376 Fix STI parsing Change-Id: Ifcf0829f187a2fb96258cb3706e52bb1ba725fe5" into development
Former-commit-id: 6a4a5789f8 [formerly d410323a97] [formerly baac824e68] [formerly 6a4a5789f8 [formerly d410323a97] [formerly baac824e68] [formerly 3dbf65f001 [formerly baac824e68 [formerly dfe0380de11634362922e9194e7a2f7e915a1445]]]]
Former-commit-id: 3dbf65f001
Former-commit-id: 75447a2206 [formerly 690ec74226] [formerly 397ba345eb6a3098f62b78a3cc7d6948c4e6f75a [formerly 117fd8377a]]
Former-commit-id: 39a431b5d7cb00600d9b47592950e3681be1732f [formerly 4abdb19dc4]
Former-commit-id: b2750336a0
|
2013-10-10 17:38:22 -05:00 |
|
Nate Jensen
|
f19d751d47
|
Issue #2361 fix iscUtil
Change-Id: I4f62e048db3c1b453f56ece98448e1cf8b35fc28
Former-commit-id: 9061866d58 [formerly fa2a7db710] [formerly 8aecb21306] [formerly 9061866d58 [formerly fa2a7db710] [formerly 8aecb21306] [formerly dc60f94a34 [formerly 8aecb21306 [formerly 93ec0db0ac9adeab663fa18f2d93eb9a42e4302b]]]]
Former-commit-id: dc60f94a34
Former-commit-id: d3e0340f3d [formerly a75c66778b] [formerly 4f809ea030f0b5f024efb499a22c552717e6efbe [formerly ef92804824]]
Former-commit-id: a86c99d52b6de9ccb07ad9ea0188560e8fa37e0c [formerly d9573cb7ca]
Former-commit-id: 47ae29e37a
|
2013-10-10 17:38:01 -05:00 |
|
Ben Steffensmeier
|
44b677853b
|
Issue #2376 Fix STI parsing
Change-Id: Ifcf0829f187a2fb96258cb3706e52bb1ba725fe5
Former-commit-id: 0f77e750f6 [formerly 29f3ac17f1] [formerly abf0df45c4] [formerly 0f77e750f6 [formerly 29f3ac17f1] [formerly abf0df45c4] [formerly f1699b1d62 [formerly abf0df45c4 [formerly 4af47a67091e0249c01289f275d44756f04e50d3]]]]
Former-commit-id: f1699b1d62
Former-commit-id: babdf64cc4 [formerly 9066930aec] [formerly 0792017648e0b6674aed4c03b8d36b760d6405c7 [formerly 5abf856ccb]]
Former-commit-id: 1a50dfeea701dbabeeaa00426b6c40d5cebade96 [formerly 799629c7c6]
Former-commit-id: c51d801aef
|
2013-10-10 15:47:54 -05:00 |
|
Lee Venable
|
5bf5c7bb79
|
Merge "Issue #2464 - fixed font memory leak." into development
Former-commit-id: 442865a5f3 [formerly e337b90ba5] [formerly 3a611d3f4f] [formerly 442865a5f3 [formerly e337b90ba5] [formerly 3a611d3f4f] [formerly feb40aada0 [formerly 3a611d3f4f [formerly 5765e3fb4ee0f7305e5ec6240caeec375dd985a9]]]]
Former-commit-id: feb40aada0
Former-commit-id: 2174aea7fc [formerly 93b93a6750] [formerly e25d2128e67f303ef6dec71f641474d70e4d5040 [formerly dc31709252]]
Former-commit-id: a1565c82d3b4f93080c914a6d50b946a5d18f82f [formerly ff8eebf909]
Former-commit-id: 334fc2ce6b
|
2013-10-10 15:29:28 -05:00 |
|
Lee Venable
|
9163052049
|
Merge "Issue #2428. Fixed memory leak for Regions" into development
Former-commit-id: e2cb973876 [formerly 10c5920b90] [formerly aa27b764ca] [formerly e2cb973876 [formerly 10c5920b90] [formerly aa27b764ca] [formerly 6282814c91 [formerly aa27b764ca [formerly 29dd5dbf962cace42e38999f075aaaa57e24f3fc]]]]
Former-commit-id: 6282814c91
Former-commit-id: 1fa0a9e763 [formerly 00f14ba5da] [formerly 93a1856b5ba4c4002a11e6208f64b92373243999 [formerly fb37fddffa]]
Former-commit-id: 2aa030ac0f467b0901a7da0f8784e23c3527851c [formerly f3c7750f8e]
Former-commit-id: e85f79ec82
|
2013-10-10 15:26:04 -05:00 |
|
Nate Jensen
|
5ad106a802
|
Merge "Issue #2361 remove ISerializableObject for hydro colors" into development
Former-commit-id: 9edf04647a [formerly 59e0414d4d] [formerly 7ca0f9a251] [formerly 9edf04647a [formerly 59e0414d4d] [formerly 7ca0f9a251] [formerly c6a8eaa841 [formerly 7ca0f9a251 [formerly 25c12b40a85db7a4e968dccb57798aaacb089b64]]]]
Former-commit-id: c6a8eaa841
Former-commit-id: b3a270b699 [formerly 8f686c0d94] [formerly e7fcbe3bbb07cea6cb476be72d6239106fca7335 [formerly 81d1faa5d4]]
Former-commit-id: 496fe395ea2f716d97eda9913850367190202ce6 [formerly 918f7be44d]
Former-commit-id: 0825384144
|
2013-10-10 15:07:34 -05:00 |
|
Slav Korolev
|
3399fc71fe
|
Issue #2428. Fixed memory leak for Regions
Former-commit-id: 2b29184b21 [formerly 2c4730db16] [formerly cab603ba36] [formerly 2b29184b21 [formerly 2c4730db16] [formerly cab603ba36] [formerly 0021d53557 [formerly cab603ba36 [formerly 899d1f6371d55056af747d8bf6dee99d0c4179c9]]]]
Former-commit-id: 0021d53557
Former-commit-id: 74fb9bb36c [formerly bd225735ff] [formerly 14b3866029e9725abb0c7991b69a2bf28a11dd22 [formerly 3631bfbeba]]
Former-commit-id: 74ecfb4c8834ca3f42313b8d89833c5de99ca36b [formerly 0babca9d58]
Former-commit-id: 4dffa06efc
|
2013-10-10 14:09:37 -04:00 |
|
Bryan Kowal
|
7c4db7372b
|
Issue #2402 - re-compile 32-bit grib2.so
Former-commit-id: 9f5cbcda14 [formerly 410b9b6669] [formerly 05954f89b8] [formerly 9f5cbcda14 [formerly 410b9b6669] [formerly 05954f89b8] [formerly 3eee9edb58 [formerly 05954f89b8 [formerly e70561d259082645390f95df823ad4583aea8bbe]]]]
Former-commit-id: 3eee9edb58
Former-commit-id: ccf1f7845b [formerly c79a66452b] [formerly d95dd19e8bd4fae3a668ab9aa814a42776b4fcb3 [formerly c7381d7ce2]]
Former-commit-id: 1430f0545832022ae3f02294f9969bd5fd850e24 [formerly 8553bbc350]
Former-commit-id: a0c583ceb6
|
2013-10-10 12:49:49 -05:00 |
|
Richard Peter
|
16cc098310
|
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 a4b1eb9dff [formerly e717ae510b] [formerly 8f67035519] [formerly d7db5d0219 [formerly 8f67035519 [formerly 3a704d8d903afc5629a13f478af585947954b5d2]]]]
Former-commit-id: d7db5d0219
Former-commit-id: 7dc72f9bba [formerly 3fec426da2] [formerly 68223945005706fda2640591654c8d7d4815f98e [formerly 6eae16a7dc]]
Former-commit-id: dc6e6aca3594aebe8bc757e3f6554467e5e116c1 [formerly 0eba27543b]
Former-commit-id: 2ee7444aa7
|
2013-10-10 11:34:11 -05:00 |
|
Bryan Kowal
|
c2e386481e
|
Issue #2297 - fix 14.2.1 qpid build
Former-commit-id: 886e5f2370 [formerly a8dfd1ef01] [formerly 9d7ad6908a] [formerly 886e5f2370 [formerly a8dfd1ef01] [formerly 9d7ad6908a] [formerly 584d8b2ae4 [formerly 9d7ad6908a [formerly 7863a68ae1c67188450ab7c3a9cc2c912533300c]]]]
Former-commit-id: 584d8b2ae4
Former-commit-id: ef3865e22a [formerly a4ea738a10] [formerly 032a9246c93b9f11150b7297e5f79e85cb21b868 [formerly be0d60134b]]
Former-commit-id: b596fd1dd4328f92bd0ae05d1d32c6eb932e52b0 [formerly e12cae21f4]
Former-commit-id: f452978591
|
2013-10-10 11:21:11 -05:00 |
|
Richard Peter
|
1fb786ab0b
|
Merge "Issue #2466 Returned to original harvesterThreadPool Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d" into development
Former-commit-id: 8ed2c3a117 [formerly f03832c79b] [formerly a3e361323c] [formerly 8ed2c3a117 [formerly f03832c79b] [formerly a3e361323c] [formerly fde5182264 [formerly a3e361323c [formerly 2d49ceead68df56e96c38652ab1c7df543f0f6d5]]]]
Former-commit-id: fde5182264
Former-commit-id: d791e5c640 [formerly ab702730a1] [formerly ae58cf5f06a38fa19ac868fb2cea93fba494a9a4 [formerly 825b01404e]]
Former-commit-id: d6d10eb19157bafe98bdc7ff9293a3e5d4e9044e [formerly 76c4d346b6]
Former-commit-id: bb9f61c6c2
|
2013-10-10 11:05:45 -05:00 |
|
Nate Jensen
|
f5dd15ee85
|
Issue #2361 remove ISerializableObject for hydro colors
Change-Id: Icc4a1e2ebff06ff389e95563406176663000ad7c
Former-commit-id: 54a13cef30 [formerly 472c2693c4] [formerly 0fe5979eac] [formerly 54a13cef30 [formerly 472c2693c4] [formerly 0fe5979eac] [formerly 83fafc638b [formerly 0fe5979eac [formerly f23474913e08b34d1eb82e2106549f57fd36538c]]]]
Former-commit-id: 83fafc638b
Former-commit-id: 4454f61a27 [formerly 91ddf05a6b] [formerly 67c022fe0bf860e2b4d22e1b1209c2a4000de21f [formerly 7fb250b184]]
Former-commit-id: e825e134e73f3a1676f359994457b5d27f05a078 [formerly 2e6998e999]
Former-commit-id: 5d533a8026
|
2013-10-10 10:57:59 -05:00 |
|
Dave Hladky
|
7b0e8b9464
|
Issue #2466 Returned to original harvesterThreadPool
Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d
Former-commit-id: 843f83e4a4 [formerly 36667033b2] [formerly 38a6b4e811] [formerly 843f83e4a4 [formerly 36667033b2] [formerly 38a6b4e811] [formerly e6931e8454 [formerly 38a6b4e811 [formerly 26316e71831c51e3ee96a1afd9ef213f1d87beff]]]]
Former-commit-id: e6931e8454
Former-commit-id: e4d7d2d8c1 [formerly edec7221f4] [formerly 51ee30687642864aed2161fc719cf2fd1f327376 [formerly 750b8aa13e]]
Former-commit-id: 8e75b531a2bf9c256097e2bfe809beceabc8d66b [formerly 05c7fc4f2d]
Former-commit-id: 7b70e44b71
|
2013-10-10 10:47:44 -05:00 |
|
Nate Jensen
|
3d8d99481d
|
Merge "Issue #2361 remove ISerializableObject for some pointdata and user roles classes" into development
Former-commit-id: 038f48e28f [formerly 55d1d12c38] [formerly b3fdf129db] [formerly 038f48e28f [formerly 55d1d12c38] [formerly b3fdf129db] [formerly 2934222c09 [formerly b3fdf129db [formerly 7a2dd6ccb98c9b7b28b989835b6ed6535f7a6ce1]]]]
Former-commit-id: 2934222c09
Former-commit-id: b726353f42 [formerly 2c9dcd242b] [formerly 71820d3260124a01642944c128826c4f9ea4e3b9 [formerly ed0c5355c5]]
Former-commit-id: ca9e8a24531c06f3dc48e8a7b31a0d22a087b4c7 [formerly 424dd26cb8]
Former-commit-id: 834f647a55
|
2013-10-10 10:09:46 -05:00 |
|
Bryan Kowal
|
1978d78a79
|
Fix Merge Issue.
Former-commit-id: 66eb9a1983 [formerly 62db4d7b07] [formerly 21df04ff39] [formerly 66eb9a1983 [formerly 62db4d7b07] [formerly 21df04ff39] [formerly db25d33a4d [formerly 21df04ff39 [formerly 91716e4f6eb81153afa48266cdd43e3239864301]]]]
Former-commit-id: db25d33a4d
Former-commit-id: 331115a9e5 [formerly e130d1ce58] [formerly f179478893abf5c2314388f9c1627b156e2a7ac8 [formerly 1263d95220]]
Former-commit-id: 7f2e531c2426317e656704a115947db1938cfed1 [formerly 2d978376ca]
Former-commit-id: 18a89d5e91
|
2013-10-10 10:04:26 -05:00 |
|
Steve Harris
|
fc43a80ca0
|
13.5.2-9 baseline
Former-commit-id: 0093ce47a8 [formerly fdbef0e663] [formerly a28a2d3041] [formerly 0093ce47a8 [formerly fdbef0e663] [formerly a28a2d3041] [formerly f36cf09d21 [formerly a28a2d3041 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]]
Former-commit-id: f36cf09d21
Former-commit-id: 13873d55c2 [formerly 7d0416293f] [formerly 9c502fedcbd501781ba7a8be644ea45c55cc5e52 [formerly 45c58e1cb3]]
Former-commit-id: 51425d8f2a233b5ad1bc16c34fa214aa28906053 [formerly be3a804cf5]
Former-commit-id: 2dc7de0754
|
2013-10-10 10:55:20 -04:00 |
|
Lee Venable
|
ea6c7ba445
|
Issue #2464 - fixed font memory leak.
Former-commit-id: 9c8d1471db [formerly e3f44d751a] [formerly 1a693c5d35] [formerly 9c8d1471db [formerly e3f44d751a] [formerly 1a693c5d35] [formerly e1adc2e4be [formerly 1a693c5d35 [formerly eceb0ab9c7ddc0d28d5452d9bf77888b9e58a9ac]]]]
Former-commit-id: e1adc2e4be
Former-commit-id: 6ac2e88aee [formerly 1b9ed84e9c] [formerly 5904fc15c7ce1db3e764a1a7c740a0ecbbe10705 [formerly b98e10fe06]]
Former-commit-id: e9f3b624851ceaa6ddf6d95220ace13d03f6679c [formerly b4ceef0f22]
Former-commit-id: 04c2ea53e9
|
2013-10-10 09:48:55 -05:00 |
|
Slav Korolev
|
b4b4259f48
|
Issue #2427. Fixed memory leak for images
Former-commit-id: 815b2fb40d [formerly 5dcf4a00bc] [formerly 012497bfef] [formerly 815b2fb40d [formerly 5dcf4a00bc] [formerly 012497bfef] [formerly f0aba7be10 [formerly 012497bfef [formerly 770bfd43e07cd92c2c8a3d7b3d1a07eb6d8b1052]]]]
Former-commit-id: f0aba7be10
Former-commit-id: a1e3716076 [formerly 09f00e1d81] [formerly 6d12d9ebc42f69dee6fac7843780d975a33617b7 [formerly 0b08d2bb0e]]
Former-commit-id: 1892d02d100b6b9cadc7a9f40525dace92cda96b [formerly 001a2d3cfc]
Former-commit-id: 3271455caf
|
2013-10-10 09:34:24 -04:00 |
|
Bryan Kowal
|
05afd001e1
|
Issue #2422 - recompile updated grib2.so for RHEL6
Former-commit-id: 92aedd9726 [formerly 585f63e88c] [formerly 9c3c123631] [formerly 92aedd9726 [formerly 585f63e88c] [formerly 9c3c123631] [formerly bb9b1e4279 [formerly 9c3c123631 [formerly ae2923791512c7488805c19a773390ef1de5150b]]]]
Former-commit-id: bb9b1e4279
Former-commit-id: 33579d76bf [formerly 80127ae62d] [formerly a05268ac0d403ee40d63b8f5718b2a93c8376d28 [formerly 9d57206173]]
Former-commit-id: f13ab25bb4f3e6990903b1045f95b649bbfa5a51 [formerly 49c19e4bb6]
Former-commit-id: 53a110866d
|
2013-10-09 18:38:58 -05:00 |
|
Nate Jensen
|
c561d5f403
|
Issue #2361 remove ISerializableObject for some pointdata and user roles classes
Change-Id: I8a4a53dd1139a376aaa001bb7fef38444d8db005
Former-commit-id: 8d5b0ce4ea [formerly 5c185a4ec2] [formerly 0cff122d9c] [formerly 8d5b0ce4ea [formerly 5c185a4ec2] [formerly 0cff122d9c] [formerly d635901828 [formerly 0cff122d9c [formerly 3fa7b3de6733842c240959030023e84c844ef760]]]]
Former-commit-id: d635901828
Former-commit-id: 55d62190fa [formerly d6c42a4edd] [formerly b77f65f419eaadf2463d896792881b416b2ab16a [formerly 25b219c49f]]
Former-commit-id: 0cd63beeaef24576d519b7c9432313ea6e3b14c2 [formerly 0821d5dc52]
Former-commit-id: 9c2532f01b
|
2013-10-09 18:03:11 -05:00 |
|
Brad Gonzales
|
568f5ba997
|
Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30
Former-commit-id: 094c9dc6a7 [formerly 59f22b866a] [formerly 73e757c284] [formerly 094c9dc6a7 [formerly 59f22b866a] [formerly 73e757c284] [formerly 61448cc04a [formerly 73e757c284 [formerly f776626738e4cc995bb16e87b8da66ff90289bd8]]]]
Former-commit-id: 61448cc04a
Former-commit-id: 74df786a0b [formerly aff77aa148] [formerly 3686551f045361598f2adaa4edad79f481b0d4e1 [formerly 55d242b86d]]
Former-commit-id: 9fb3511af54c1ee9e26fe40f8ed5f7f146889f9c [formerly b24299e301]
Former-commit-id: af191df5cf
|
2013-10-09 17:58:12 -05:00 |
|
Bryan Kowal
|
53e3ff55bc
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 740c53e49e [formerly 82559064ef] [formerly 37d1dd492b] [formerly 740c53e49e [formerly 82559064ef] [formerly 37d1dd492b] [formerly 2b26c4c242 [formerly 37d1dd492b [formerly 2e6b76af19b308392e90dfee4c950200ec5c2560]]]]
Former-commit-id: 2b26c4c242
Former-commit-id: 0b923f47dd [formerly 68434c23ef] [formerly 15d79cf54ce977ffbd4be67b9b37cb4278fb7560 [formerly daeb4b7ecb]]
Former-commit-id: a3c2ac0f6a104964578e34f2d4ffac6825b76165 [formerly f31f6ea11d]
Former-commit-id: d65db49046
|
2013-10-09 17:07:10 -05:00 |
|
David Gillingham
|
f65ec2952a
|
Issue #2418: Fix parameter naming issue in PHISH parameter info file.
Change-Id: I96dc326eba20ffa7c267248fd12343347e1ea93b
Former-commit-id: a3fe29cdfc [formerly 5e2157c933] [formerly dda31532a4] [formerly a3fe29cdfc [formerly 5e2157c933] [formerly dda31532a4] [formerly d0091e0f84 [formerly dda31532a4 [formerly c1244e64aeeda450462592bb46ea6bede17ee219]]]]
Former-commit-id: d0091e0f84
Former-commit-id: dedc61720d [formerly 2ae3f7b9f3] [formerly 0bbe82a97084e5cbe2290d616171d00b64f5188a [formerly 303a8802ef]]
Former-commit-id: bf59a16c0e0b5e0e3d241670ef465532531d0cd6 [formerly 9fb19d2b4c]
Former-commit-id: 47ff31848c
|
2013-10-09 14:44:55 -05:00 |
|
Ron Anderson
|
4cac404a93
|
Merge "Issue #2418: Add display support for pSurge 2.0 data in GFE." into development
Former-commit-id: 2c1c626095 [formerly e8e47e87b0] [formerly f3118d421c] [formerly 2c1c626095 [formerly e8e47e87b0] [formerly f3118d421c] [formerly d66c9d7322 [formerly f3118d421c [formerly 3b0b5e51da60b3b5d347d7325be376abb5902da8]]]]
Former-commit-id: d66c9d7322
Former-commit-id: c3a7a832db [formerly 5812db03e2] [formerly dc7c32cd697ac548fb0ea0454b19821714398f4b [formerly 5cea601f85]]
Former-commit-id: a30a319e3825403362f4e764ffe34fbf033121bb [formerly 5b27c23897]
Former-commit-id: bc4bd47b90
|
2013-10-09 14:00:21 -05:00 |
|
Bryan Kowal
|
c4af94c8dc
|
Issue #2423 - Windows Java 7 Updates. Note: AWIPSII.Environment is not an Eclipse plugin project
Former-commit-id: 5c40f6f030 [formerly 0ea8a8b08c] [formerly 7881af2c69] [formerly 5c40f6f030 [formerly 0ea8a8b08c] [formerly 7881af2c69] [formerly 0bbf1cd01f [formerly 7881af2c69 [formerly db5f7bf2c2cc1abae67462a78a2b52fe0bc1f3fa]]]]
Former-commit-id: 0bbf1cd01f
Former-commit-id: bc98e950b6 [formerly 1ecf059cd7] [formerly a57d7af13c6f4eee411ccc79768e7251e34f24aa [formerly 697cde0f3a]]
Former-commit-id: a1e693673fcdd49f4c1e69a9f314b2d355462257 [formerly ae96da2f88]
Former-commit-id: a57eee1184
|
2013-10-09 13:26:27 -05:00 |
|
Richard Peter
|
db521b7fff
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
rpms/awips2.cave/Installer.cave-feature/component.spec
Former-commit-id: ca61898cb4 [formerly 62b322c18d] [formerly 1a664aed21] [formerly ca61898cb4 [formerly 62b322c18d] [formerly 1a664aed21] [formerly c0643db0ba [formerly 1a664aed21 [formerly fee86c220c12c09c714245fa8666bc08f4f9775b]]]]
Former-commit-id: c0643db0ba
Former-commit-id: 57c11e762e [formerly 1c74c3cbde] [formerly 015b66f07af3e9d194a45a1c6b1ca9257fb5ff94 [formerly ecba2f7317]]
Former-commit-id: a98f9803d8b17634f3ea5bdd6a61850aaef01d2a [formerly 93c2c93969]
Former-commit-id: bb0bd3fe2c
|
2013-10-09 13:14:06 -05:00 |
|
Richard Peter
|
92d82bee74
|
Merge "Issue #2402 Modify grib decoder to work on file extents. Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9" into development
Former-commit-id: d2b5823a5d [formerly fcb0b32ae2] [formerly d8df407119] [formerly d2b5823a5d [formerly fcb0b32ae2] [formerly d8df407119] [formerly 117c82a06d [formerly d8df407119 [formerly 06caa25b31163ceb228982fc7e5e51b5bc8f33a0]]]]
Former-commit-id: 117c82a06d
Former-commit-id: a62c0c89f0 [formerly 52c9791172] [formerly 098a678163bad68244b64c738657d1a25861555c [formerly a6f7a7ca7f]]
Former-commit-id: 5af273e4748b588bc455a1e4f8a1776fb60b4df1 [formerly 5eaa25b609]
Former-commit-id: 28ae696899
|
2013-10-09 13:13:18 -05:00 |
|
Nate Jensen
|
47cfbd970c
|
Merge "Issue #2457 Improve error messages for missing radar icao." into development
Former-commit-id: 6df3eaa7d1 [formerly 1d3742a979] [formerly 4b541c4c23] [formerly 6df3eaa7d1 [formerly 1d3742a979] [formerly 4b541c4c23] [formerly e8f53dd99a [formerly 4b541c4c23 [formerly e67b29df638e59b18e552d1e596034f70d08adbc]]]]
Former-commit-id: e8f53dd99a
Former-commit-id: e5ad1cf04f [formerly 1a0df35030] [formerly 7a47fcf3e2af1a3c7f7cfcf25bfe06c45c2929a1 [formerly b21799b783]]
Former-commit-id: 6cb1e75d11ac912c5c7e14c23cea3251bf801572 [formerly 7081eafc36]
Former-commit-id: ef28261133
|
2013-10-09 13:10:28 -05:00 |
|
Ben Steffensmeier
|
f8fc4887db
|
Issue #2402 Modify grib decoder to work on file extents.
Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9
Former-commit-id: d9f383217f [formerly c896c9bf30] [formerly 7d2b48de48] [formerly d9f383217f [formerly c896c9bf30] [formerly 7d2b48de48] [formerly 2b089b0848 [formerly 7d2b48de48 [formerly 1525772d1b42348f0eca78fc966d2c7878496ea7]]]]
Former-commit-id: 2b089b0848
Former-commit-id: ac95afdc52 [formerly 7c6a89b623] [formerly 0d5227b724cd17eaba30e60c17888c90e0ec5d1f [formerly 633a075052]]
Former-commit-id: c5be325dbe4d5bca7afde6dd2069d2369529c96e [formerly 839c602669]
Former-commit-id: 870631902b
|
2013-10-09 12:50:02 -05:00 |
|
Ben Steffensmeier
|
79ab4e0711
|
Issue #2457 Improve error messages for missing radar icao.
Former-commit-id: 5fe6750c52 [formerly c43f3e11a6] [formerly 52beccc5c9] [formerly 5fe6750c52 [formerly c43f3e11a6] [formerly 52beccc5c9] [formerly 7c8a3b80fa [formerly 52beccc5c9 [formerly ef0680d3f4acfa64d90af2e074f6642d1386d3ab]]]]
Former-commit-id: 7c8a3b80fa
Former-commit-id: 045c78cf19 [formerly 18c59f3573] [formerly 002ff563fe4ca9a4b1f11fe8f5e344bd82427521 [formerly 070e2cfdac]]
Former-commit-id: 4980255877a1df09ea18fa62fd3ff3622dd7812d [formerly 2edbb6e665]
Former-commit-id: 236be63083
|
2013-10-09 12:11:27 -05:00 |
|
Lee Venable
|
6e3304142d
|
Issue #2447 - fixed color memory leak.
Former-commit-id: 4fd007cdb0 [formerly 91cafa3d45] [formerly 527f88ddac] [formerly 4fd007cdb0 [formerly 91cafa3d45] [formerly 527f88ddac] [formerly 8d341f499d [formerly 527f88ddac [formerly fe59f0923caa13c089edb683611b986522476539]]]]
Former-commit-id: 8d341f499d
Former-commit-id: 32ddffea14 [formerly 481bc0875e] [formerly a9303f9b91f65f21c748b5e607cdaa2dcbd3375d [formerly 717ba7e08e]]
Former-commit-id: 4d5b99af447990783c85e617138c2b3b88d886b6 [formerly 409370108d]
Former-commit-id: 965c691200
|
2013-10-09 10:07:37 -05:00 |
|
Nate Jensen
|
991f4cf832
|
Merge "Issue #2402 Make PythonDecoder more extendable." into development
Former-commit-id: ad19fcbd3c [formerly e0cbf2e05f] [formerly 7cecf177fe] [formerly ad19fcbd3c [formerly e0cbf2e05f] [formerly 7cecf177fe] [formerly 2d25d9e46a [formerly 7cecf177fe [formerly 3daa3f8284a5a65657429503c055ab34c1ebfb48]]]]
Former-commit-id: 2d25d9e46a
Former-commit-id: 941a19ec45 [formerly c026672fe1] [formerly 8141501f8e4bab22b63e925b68fc97ace6d52f88 [formerly 9ca9bd05a0]]
Former-commit-id: cc663756e83249c64df8e4c326256f3fc12be057 [formerly 75f9f891a7]
Former-commit-id: 4988c3b715
|
2013-10-08 16:20:43 -05:00 |
|
Bryan Kowal
|
8da1b95cc4
|
Merge "Issue #2033 - windows build updates for etc directory deployment" into development
Former-commit-id: 6b2a1c0c05 [formerly 00f1a83966] [formerly f6e6932434] [formerly 6b2a1c0c05 [formerly 00f1a83966] [formerly f6e6932434] [formerly 7ddd665597 [formerly f6e6932434 [formerly 3a1e9baf2c593ee99f9b0299debceafab653fc46]]]]
Former-commit-id: 7ddd665597
Former-commit-id: 315f1cf666 [formerly 5e114e4f5d] [formerly 92694a2e2db20b452689b28972a258ded040e5cc [formerly 6a33ba460f]]
Former-commit-id: 9b69d11012d0a637fe88ab126bb13f6b2712b4d6 [formerly 78e7109310]
Former-commit-id: d10a370207
|
2013-10-08 15:38:20 -05:00 |
|
Bryan Kowal
|
d6d7b8d2ac
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.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.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: ab10c1dd5b [formerly bb5ef114d1] [formerly aa4ea792c1] [formerly ab10c1dd5b [formerly bb5ef114d1] [formerly aa4ea792c1] [formerly 542f5f2349 [formerly aa4ea792c1 [formerly 606030384b5fe1eb9411d4b35d3282b15b1398b4]]]]
Former-commit-id: 542f5f2349
Former-commit-id: 3534686eb5 [formerly de61382dc7] [formerly 518cc2598c60d171ae83c427ee2062c4d7ef8025 [formerly 5d5ccb7599]]
Former-commit-id: 0c291efdbf84e5f8baf1abb4fbbc4e083a99112e [formerly 86f7af5968]
Former-commit-id: 93dbbc2321
|
2013-10-08 14:44:38 -05:00 |
|
Richard Peter
|
85ac6ffc2d
|
Merge "Issue #2442 Case creation no longer contains category directory." into omaha_13.5.3
Former-commit-id: 7dfa5a2ea3 [formerly a7a3df7894] [formerly 2822583c3d] [formerly 7dfa5a2ea3 [formerly a7a3df7894] [formerly 2822583c3d] [formerly d409715b41 [formerly 2822583c3d [formerly 68f0f992a67d4fd523cf91b492fd9c2c56573f65]]]]
Former-commit-id: d409715b41
Former-commit-id: 146cbb29fc [formerly 2e4f22c5f0] [formerly 29a8e32f9be08d61d7f6f95d67c55d6870c981b0 [formerly c0a36a1f5c]]
Former-commit-id: fe5ae60ed7650ba9c40a52e63f0fdfebb486fa30 [formerly eefd87ec34]
Former-commit-id: 372b951488
|
2013-10-08 14:32:28 -05:00 |
|
Richard Peter
|
3f75f1804e
|
Merge branch 'omaha_13.5.3' (13.5.2-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371
Former-commit-id: 1af5b95d92 [formerly f141fdd5ab] [formerly 9adbe25ceb] [formerly 1af5b95d92 [formerly f141fdd5ab] [formerly 9adbe25ceb] [formerly b6395cc834 [formerly 9adbe25ceb [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]]
Former-commit-id: b6395cc834
Former-commit-id: 873d2bf184 [formerly 0e7dccd18f] [formerly 2c457acf95f4418fe275e09d6d24693aa278fc9b [formerly 3abe952ca0]]
Former-commit-id: f0f8ac95083f4a299eb6e6aa1073debeb4a2953a [formerly 1895c9f914]
Former-commit-id: bc32641181
|
2013-10-08 10:59:50 -05:00 |
|
Richard Peter
|
c1adafc8f6
|
Merge "Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects" into development
Former-commit-id: 8d685ae419 [formerly f7ae6aae92] [formerly 28760a1273] [formerly 8d685ae419 [formerly f7ae6aae92] [formerly 28760a1273] [formerly 7a4ed8bea4 [formerly 28760a1273 [formerly fd76d3a72bd18a2afdce5855173a5a9b9ad9e00b]]]]
Former-commit-id: 7a4ed8bea4
Former-commit-id: 605a825c3a [formerly f28a0c025e] [formerly a6096c75637f44fedac9a8bfb4d95837328c1a2e [formerly 0b1f6e2c9b]]
Former-commit-id: d7c1580505db4e2fd0a5c3c0b905e08577fed539 [formerly 9abed1e51e]
Former-commit-id: b2b7521cab
|
2013-10-08 10:50:59 -05:00 |
|
Roger Ferrel
|
04786dac99
|
Issue #2438 Changes to properly load and save retentions times.
Change-Id: I05a516f1728ad3340547d43da025c6227d7b5551
Former-commit-id: 659313ad31 [formerly a393894c67] [formerly d0f7e12518] [formerly 659313ad31 [formerly a393894c67] [formerly d0f7e12518] [formerly 0ee16e8524 [formerly d0f7e12518 [formerly c3a887ca435140ec8cd944da1afa417ad45ea3c6]]]]
Former-commit-id: 0ee16e8524
Former-commit-id: 789357a6d4 [formerly fd96bef170] [formerly 655bfac726411200a6012321c5084c55a8d6cb38 [formerly 1ba0b3f411]]
Former-commit-id: 7eae0e83b8a985102d905e80b8fe3470f6b3ae5b [formerly 1784d0d0c0]
Former-commit-id: 1759da2158
|
2013-10-08 10:48:42 -05:00 |
|