Commit graph

3918 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Lee Venable
513370deee Merge "Issue #2443 - fixed image memory leak." into development
Former-commit-id: 43acce4d38 [formerly 766190493e] [formerly 18845668a6] [formerly 43acce4d38 [formerly 766190493e] [formerly 18845668a6] [formerly ea27ffd4a3 [formerly 18845668a6 [formerly 1ef7b46cb407dfebbf010a4b59bea8d8ef3eb595]]]]
Former-commit-id: ea27ffd4a3
Former-commit-id: d7cd7740ba [formerly ec38285d85] [formerly 25632dc0eed72cff650c2d3f677914eab9537e20 [formerly 664971b75b]]
Former-commit-id: a2c78e01e5fec01cb6f6a2aa28431c777e8a3aeb [formerly c775ac006f]
Former-commit-id: 7d3285a04a
2013-10-08 10:33:03 -05:00
Dave Hladky
e103fa9c58 Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects
Former-commit-id: 521cb3a61d [formerly 4867082be1] [formerly fbe4078bc5] [formerly 521cb3a61d [formerly 4867082be1] [formerly fbe4078bc5] [formerly ad1bb73c70 [formerly fbe4078bc5 [formerly c299ed7a5bb02980ecb30b0ab38752d2878d50a7]]]]
Former-commit-id: ad1bb73c70
Former-commit-id: 62c7b8a83b [formerly 445d836fe6] [formerly 91f21451dc2485422212959320afb62a1b8190e7 [formerly 093b41499b]]
Former-commit-id: ad72de9511e44f91521120647a5a70b0caacc31f [formerly 7807722694]
Former-commit-id: de24cf3b9a
2013-10-08 10:25:36 -05:00
Richard Peter
3f32cc7a8b Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
	rpms/awips2.qpid/0.18/SOURCES/wrapper.conf

Former-commit-id: f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 31c87ab01e [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]]
Former-commit-id: d9eae3ea28
Former-commit-id: af9c4be87a [formerly 94d0913bd9] [formerly ff84474d44083bc5676fa6731229af076e27cb80 [formerly f4b47dda50]]
Former-commit-id: 4e8e2fc0d4cdef4da801ac692b1793e0b0aadafc [formerly 33b4f0c247]
Former-commit-id: d321c61259
2013-10-08 09:45:27 -05:00
Lee Venable
cdba1e48df Issue #2443 - fixed image memory leak.
Former-commit-id: 7dae2b36cf [formerly 1021c25d9d] [formerly 0bacce33bc] [formerly 7dae2b36cf [formerly 1021c25d9d] [formerly 0bacce33bc] [formerly 47f8200757 [formerly 0bacce33bc [formerly fccb24f5834dd746f6868b4390e3c17dd12dc729]]]]
Former-commit-id: 47f8200757
Former-commit-id: fc98572a27 [formerly 03c4e9a287] [formerly 43dc0958942086502dfa768b01124fa7746d0abb [formerly cd63ee8644]]
Former-commit-id: ba282d5c92d098a16eba78a72542a536bd52ee6b [formerly 162df3c8d2]
Former-commit-id: e2b44eac03
2013-10-08 09:39:00 -05:00
Max Schenkelberg
6afd29dae3 Issue #2081 Created custom dataURI field converter interface for use with DataTime so toString can be left unchanged (with spaces) and dataTimes in the dataURI will also be left unchanged (with underscores). Refactored DataURIUtil to support these new field converters.
Change-Id: I0a3983b04a475f6fcf5f70ee89cecf6dd2e67676

Former-commit-id: 86f38edeac [formerly 0e1a4fdf96] [formerly 1bc2e9aa2b] [formerly 86f38edeac [formerly 0e1a4fdf96] [formerly 1bc2e9aa2b] [formerly 782ec43213 [formerly 1bc2e9aa2b [formerly 86788ab1704c381fc2d26b1891e37aed7367fd3d]]]]
Former-commit-id: 782ec43213
Former-commit-id: 8d83725f8b [formerly 347fd2bfe0] [formerly 3da149ba88c46d6af3cc067262f89258c997b007 [formerly d1e5c9d9e2]]
Former-commit-id: b175428aba00ad616d0c62201fbb2967dbcec0ac [formerly 1cc4b105e9]
Former-commit-id: 8727dcb949
2013-10-08 09:34:08 -05:00
Bryan Kowal
6838bff38e Issue #2033 - windows build updates for etc directory deployment
Change-Id: Icfb30220639eeefe01a03479f0a5248dcb5cf928

Former-commit-id: c7ea9ddac2 [formerly 89c561ad89] [formerly c5f6540e3c] [formerly c7ea9ddac2 [formerly 89c561ad89] [formerly c5f6540e3c] [formerly 073fd49741 [formerly c5f6540e3c [formerly d51012b2e5685e547d0d8f3b3ccd0f4c4640b9dc]]]]
Former-commit-id: 073fd49741
Former-commit-id: cc0ed5ee96 [formerly 42ac7b6bdd] [formerly 03fce35c4a56e480e55739c7f4bfb5c42b76f678 [formerly e3ad305202]]
Former-commit-id: d34c434b98be92df3170f3a3e4e3928556e2e1b2 [formerly cef35754ca]
Former-commit-id: 9d045d3c92
2013-10-07 18:41:49 -05:00
Brad Gonzales
0c28bac66b Issue #2267 Shared Subscription fixes. DataDelivery Port environment standardization. Logging updates.
Amend: Refactored WMO header applier.
       Fixes for WMO header applier.
       Updated dataDeliveryRetrieval.xml with correct wmo header pattern.
       Removed manual ingest from registry mode.
       Simplified data delivery distribution matching pattern.
       Added serialize test for wfs response.
       Updated comments.
       Moved WfsRetrievalResponse to com.raytheon.uf.edex.datadelivery.retrieval package.
       Added WfsRetrievalResponse to Jaxb unmarshalable classes in DeserializeRetrievedDataFromIngest.
       HibernateBandwidthInitializer.executeAfterRegistryInit(), in NCF mode schedules shared subs.

Change-Id: I0278339701f5f55491120c35d80cbd6d3dcc84f7

Former-commit-id: 08817277b4 [formerly dc45b582e1] [formerly 21acb75f24] [formerly 08817277b4 [formerly dc45b582e1] [formerly 21acb75f24] [formerly a6540d69ea [formerly 21acb75f24 [formerly 8bf8efa14520aaba532ca7a2e82e4c1fa24adca8]]]]
Former-commit-id: a6540d69ea
Former-commit-id: cb185b2395 [formerly e129c33bee] [formerly 66f28211c1048177be60ab32e1b6360946fea466 [formerly 9d981ab2f3]]
Former-commit-id: 47936db769a40ca23057acc514918317e8c3fd70 [formerly 0f3b5172d4]
Former-commit-id: 0313e9c835
2013-10-07 17:06:38 -05:00
Richard Peter
56e8a04739 Merge "Issue #2385 Fixed subscription backup web page" into development
Former-commit-id: a5df53787e [formerly 540d0e7b9c] [formerly 9e17d68bd1] [formerly a5df53787e [formerly 540d0e7b9c] [formerly 9e17d68bd1] [formerly 472b3b10a3 [formerly 9e17d68bd1 [formerly 73b5da79892dd0781638329e4dd7be56a11e642d]]]]
Former-commit-id: 472b3b10a3
Former-commit-id: 1be34a6708 [formerly 0306778ac2] [formerly 3f1f17b8b8f7c9e5603efd120ec81f4b642d6876 [formerly eb5b61ba85]]
Former-commit-id: dd1b63cdd7cee780019dc244e6a0393018f8ff60 [formerly a02af3bc08]
Former-commit-id: cf210025ae
2013-10-07 16:21:46 -05:00
Richard Peter
9afa320d3b Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development
Former-commit-id: 8d8d1f4996 [formerly 9d424c212b] [formerly 2e062048e1] [formerly 8d8d1f4996 [formerly 9d424c212b] [formerly 2e062048e1] [formerly e2c7bb21d7 [formerly 2e062048e1 [formerly 204c2034a08cd69fc7286639f37e5ff936ecf49e]]]]
Former-commit-id: e2c7bb21d7
Former-commit-id: 55c9d3f470 [formerly 80dd506d10] [formerly 3a79334f10bfa880b8282cf69118ab055077d496 [formerly e43cd4b397]]
Former-commit-id: 2a096cf0447100b6a3d5f28db7d1dd0106f8384c [formerly 7ef56bfc43]
Former-commit-id: 54dc5aa82c
2013-10-07 16:19:11 -05:00
Greg Armendariz
ffb694a4b9 Merge "Issue #2033 - deploy the CAVE localization to the etc directory at installation time" into development
Former-commit-id: 46e40d4816 [formerly 13fe6c9677] [formerly b11cc68fb9] [formerly 46e40d4816 [formerly 13fe6c9677] [formerly b11cc68fb9] [formerly 0fe6f6c591 [formerly b11cc68fb9 [formerly 194bf8383e6b01f689500212413994c67449d1b7]]]]
Former-commit-id: 0fe6f6c591
Former-commit-id: c739504d85 [formerly a4af4a4856] [formerly 9419cce994fbb5fb682ebd497cc7b76d2171f780 [formerly 2c93afc923]]
Former-commit-id: c387ffa8f42e87f7d9b49c0353ab0f9ee5923074 [formerly cf86299e1c]
Former-commit-id: 08f4f74ad3
2013-10-07 14:50:02 -05:00
Nate Jensen
7d65d086ff Issue #2361 remove ncep met parameter classes from ISerializableObject file since they're not being transformed to/from XML
Change-Id: I3f27652ff84147dc2b9ce35112dad2434ce227e1

Former-commit-id: d54a78a7fc [formerly dc909c42ee] [formerly b2f0d58379] [formerly d54a78a7fc [formerly dc909c42ee] [formerly b2f0d58379] [formerly 2fc0ea395c [formerly b2f0d58379 [formerly bfce20fe8a481e6a9767803cf24da42ac48ae051]]]]
Former-commit-id: 2fc0ea395c
Former-commit-id: b86ea30ec9 [formerly d1e416ea39] [formerly 2bf05a30475416a1fd2ec531963eaf137f43c1e0 [formerly 6ec616401a]]
Former-commit-id: 1aa2d9af53a629d34796d48ac8b9b2da5ed9d024 [formerly 913cd8d0d1]
Former-commit-id: 83f9e66092
2013-10-07 14:30:19 -05:00
Nate Jensen
a87c26d729 Merge "Issue #2361 remove XML annotations from IHFS table classes" into development
Former-commit-id: 7c9622f3b5 [formerly 96687f720f] [formerly be30e6da89] [formerly 7c9622f3b5 [formerly 96687f720f] [formerly be30e6da89] [formerly 5b0e80322a [formerly be30e6da89 [formerly b33d425446cac196dd7530d250790c3361762740]]]]
Former-commit-id: 5b0e80322a
Former-commit-id: e9ffe59bc6 [formerly af56367b95] [formerly cda6eff5c9fbc185dcf5b2b57eba6ee9353398bf [formerly 571c69f4a0]]
Former-commit-id: d83d32588dd9fe4166aa40acc622a8ce619377e2 [formerly 92f3b9cfa9]
Former-commit-id: 2096477ed6
2013-10-07 14:21:40 -05:00
Lee Venable
b6fff4e6e2 Merge "Issue #2437 - fixed color memory leak." into development
Former-commit-id: 7321f4e61f [formerly 3bfe4bf45c] [formerly 5081bbd0ab] [formerly 7321f4e61f [formerly 3bfe4bf45c] [formerly 5081bbd0ab] [formerly b1d02c6a49 [formerly 5081bbd0ab [formerly b7691a4e940cc3461a39cce871c6de15110bf1d1]]]]
Former-commit-id: b1d02c6a49
Former-commit-id: ca281660c6 [formerly ee63fc9004] [formerly e2df9e89f7153660d6c4bffe212ef2cb3e805d3e [formerly 4060fa7e0b]]
Former-commit-id: af0c173990abaff7d9fea09cc035f1eaafcda70b [formerly 13a8614130]
Former-commit-id: db4f3fd35a
2013-10-07 14:13:56 -05:00
Lee Venable
60fc2554e9 Merge "Issue #2421 optimize color map loading. Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304" into development
Former-commit-id: ccb9b15f8c [formerly f94bcf4776] [formerly eeee5c7948] [formerly ccb9b15f8c [formerly f94bcf4776] [formerly eeee5c7948] [formerly c01eb85e53 [formerly eeee5c7948 [formerly 7139b6fe32b6de8c87c96e3b55d6ad83f11b149a]]]]
Former-commit-id: c01eb85e53
Former-commit-id: 54975835b5 [formerly 18bbfeb4cb] [formerly 44f2874ed6741bb80dbe72b605f855a78f686c71 [formerly 72a6650958]]
Former-commit-id: 16d3cd33db591cd73e2703d41edeab7fa50c3643 [formerly f34b07d207]
Former-commit-id: 61201849dd
2013-10-07 13:56:50 -05:00
Lee Venable
e4a7b72c9e Issue #2437 - fixed color memory leak.
Former-commit-id: 4f5ee0dbcd [formerly 615fcc7f8e] [formerly 604f8f86a4] [formerly 4f5ee0dbcd [formerly 615fcc7f8e] [formerly 604f8f86a4] [formerly a4be7633a6 [formerly 604f8f86a4 [formerly f081bea82ced5931f8424d51994571d5a9971cfe]]]]
Former-commit-id: a4be7633a6
Former-commit-id: 9502d31555 [formerly 046a0a764d] [formerly e3d05cf966b9b910eaf401e19cf70c624f4713f0 [formerly b3efbb97c1]]
Former-commit-id: 7e2f5ee8acd402f4b53f733aef6203fa20af913f [formerly 27a4e1ef75]
Former-commit-id: d07fc36b0c
2013-10-07 13:55:54 -05:00
Nate Jensen
48115ef8ae Issue #2361 remove XML annotations from IHFS table classes
Change-Id: I10c3fb7aeec4ec96a17d54ee388c4b0770e9e939

Former-commit-id: 64a5f390c8 [formerly f2dd7d28e1] [formerly 55a39d6458] [formerly 64a5f390c8 [formerly f2dd7d28e1] [formerly 55a39d6458] [formerly ded2e8a852 [formerly 55a39d6458 [formerly 137b91fdad93d661243ecfbb60e28dc0c77b5b76]]]]
Former-commit-id: ded2e8a852
Former-commit-id: 8358e38636 [formerly e40465105c] [formerly c859edc26db34632f9698fc027f825d83211ccd0 [formerly 1d3b896c05]]
Former-commit-id: 092a3fef5b9be8e85d4f9c722430314c58821cb1 [formerly e267e0336b]
Former-commit-id: e86afaee6d
2013-10-07 13:06:05 -05:00
Richard Peter
20f1569e97 Issue #2357: Remove edex jms resource reuse by other threads.
Change-Id: I73f5a01f2d943bb9f7f4e51028cc16bfcee3d823

Former-commit-id: d68188c3c2 [formerly c146f90a09] [formerly be99174b65] [formerly d68188c3c2 [formerly c146f90a09] [formerly be99174b65] [formerly 802ab87e57 [formerly be99174b65 [formerly a13a027b07a8d080c4506748afe5882575ae6532]]]]
Former-commit-id: 802ab87e57
Former-commit-id: 681f174d88 [formerly 7dc61aceee] [formerly a391c7d1d91621bfca9c5deeb80e3d2239e0295a [formerly 5320536f54]]
Former-commit-id: 0af0b7c04dbb08e74aefe806a6e6a398a4a099fa [formerly 91bf400b6a]
Former-commit-id: 74b976232c
2013-10-07 12:38:08 -05:00
Bryan Kowal
74607bfac3 Issue #2033 - deploy the CAVE localization to the etc directory at installation time
Change-Id: I899b89c12d2bbe2fb739ba15b3bafbc9855e6102

Former-commit-id: b64ff3e5b0 [formerly 5f72ab9b4e] [formerly 73ccd8245d] [formerly b64ff3e5b0 [formerly 5f72ab9b4e] [formerly 73ccd8245d] [formerly c3a65f9882 [formerly 73ccd8245d [formerly 40d1633bb60c1d9aefcc79022158a66b50cca054]]]]
Former-commit-id: c3a65f9882
Former-commit-id: 6d41496563 [formerly 0f9d525ac1] [formerly 6318bd34a70adec7bacce93dbc889b1c6350df7e [formerly e27bfa7c27]]
Former-commit-id: 9b503867b3bc3cb0c68df17ca895e1a78b627a49 [formerly 2f2c57b448]
Former-commit-id: f7c5884c21
2013-10-07 12:22:50 -05:00