Ben Steffensmeier
|
fb0f53feb8
|
Issue #2402 Make grib large grid handling more dynamic.
Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d
Former-commit-id: 2de4562585 [formerly 3fd473e25d] [formerly 2de4562585 [formerly 3fd473e25d] [formerly 0ecab8d44e [formerly bec1391240d3bf2ac0da4e8b29ae6ce3985e3d32]]]
Former-commit-id: 0ecab8d44e
Former-commit-id: 0a125ce17b [formerly 78b278e4ef]
Former-commit-id: 3f554d680f
|
2013-10-11 15:22:32 -05:00 |
|
Max Schenkelberg
|
99d63398a3
|
Issue #2081 Fixed null pointer in DataURIUtil
Change-Id: Ic052c0d12e51949568bb5540ab97b1e0091ca231
Former-commit-id: 8e1a0cb397 [formerly 819df41147] [formerly 8e1a0cb397 [formerly 819df41147] [formerly 67bfa28850 [formerly ab9174cac744785588c49237fde5cb497fb09d0f]]]
Former-commit-id: 67bfa28850
Former-commit-id: fe93c69429 [formerly 50fd97a5d5]
Former-commit-id: e8be0b3728
|
2013-10-11 14:29:11 -05:00 |
|
Lee Venable
|
913b363cc9
|
Merge "Issue #2471 - fixed color memory leak." into development
Former-commit-id: 16e5a0223a [formerly 3b98dc699c] [formerly 16e5a0223a [formerly 3b98dc699c] [formerly 06a38bd123 [formerly 1cb4839c1115ff4e65dcfd27377f81af7795ddd0]]]
Former-commit-id: 06a38bd123
Former-commit-id: 3e95f8feb8 [formerly 82556ab7ec]
Former-commit-id: 34b2bbc487
|
2013-10-11 13:02:35 -05:00 |
|
Max Schenkelberg
|
11980c92ae
|
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: 06603cabe5 [formerly fbc06d81f7] [formerly 06603cabe5 [formerly fbc06d81f7] [formerly 41b6f79c52 [formerly 2957c9c40fe85cbe5bd90c5f6444fce1f9ffdcf1]]]
Former-commit-id: 41b6f79c52
Former-commit-id: 3aa9f8cc42 [formerly dd99767050]
Former-commit-id: 239d0e52ea
|
2013-10-11 12:14:21 -05:00 |
|
Nate Jensen
|
a6535a0494
|
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: c6c2f50562 [formerly 8208d756c7] [formerly c6c2f50562 [formerly 8208d756c7] [formerly d5d0fab53b [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]]
Former-commit-id: d5d0fab53b
Former-commit-id: fd3a19a73c [formerly a34777a738]
Former-commit-id: 184d23719b
|
2013-10-11 11:21:18 -05:00 |
|
Lee Venable
|
98baa074a2
|
Issue #2471 - fixed color memory leak.
Former-commit-id: 97b3c7af6b [formerly bceb4d76bf] [formerly 97b3c7af6b [formerly bceb4d76bf] [formerly 61e5d5e4da [formerly a573bacadd4d9b3ea0058bb70b348372b6a21cc9]]]
Former-commit-id: 61e5d5e4da
Former-commit-id: cec4aecdaa [formerly 107b35761b]
Former-commit-id: 7335826e3f
|
2013-10-11 11:09:57 -05:00 |
|
Brad Gonzales
|
feef0a0b55
|
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: ac3d87c397 [formerly 25710edd9e] [formerly ac3d87c397 [formerly 25710edd9e] [formerly bc87f2a168 [formerly a01619f78bac065e7d42e28882157778aba09b75]]]
Former-commit-id: bc87f2a168
Former-commit-id: 5825fa41d6 [formerly 897fdfc2f6]
Former-commit-id: 32dce367a9
|
2013-10-11 10:36:53 -05:00 |
|
Max Schenkelberg
|
a9a73d12cb
|
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: b64050ff1e [formerly 7a66a3c995] [formerly b64050ff1e [formerly 7a66a3c995] [formerly 01c0e022d5 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]]
Former-commit-id: 01c0e022d5
Former-commit-id: dfd6ffabd8 [formerly cf0ad44ee3]
Former-commit-id: 3c2f370688
|
2013-10-11 10:21:37 -05:00 |
|
Ron Anderson
|
846b12a916
|
Merge "Issue #2361 fix iscUtil" into development
Former-commit-id: 1d74ec7b95 [formerly 3e260a58d9] [formerly 1d74ec7b95 [formerly 3e260a58d9] [formerly 584a782545 [formerly 52834c2c4a82218588f2725c3ea12c4ce8e3dc14]]]
Former-commit-id: 584a782545
Former-commit-id: e421c4c24f [formerly d13c6943da]
Former-commit-id: 5b87108b39
|
2013-10-10 18:03:36 -05:00 |
|
Nate Jensen
|
b2750336a0
|
Merge "Issue #2376 Fix STI parsing Change-Id: Ifcf0829f187a2fb96258cb3706e52bb1ba725fe5" into development
Former-commit-id: d410323a97 [formerly baac824e68] [formerly d410323a97 [formerly baac824e68] [formerly 3dbf65f001 [formerly dfe0380de11634362922e9194e7a2f7e915a1445]]]
Former-commit-id: 3dbf65f001
Former-commit-id: 690ec74226 [formerly 117fd8377a]
Former-commit-id: 4abdb19dc4
|
2013-10-10 17:38:22 -05:00 |
|
Nate Jensen
|
47ae29e37a
|
Issue #2361 fix iscUtil
Change-Id: I4f62e048db3c1b453f56ece98448e1cf8b35fc28
Former-commit-id: fa2a7db710 [formerly 8aecb21306] [formerly fa2a7db710 [formerly 8aecb21306] [formerly dc60f94a34 [formerly 93ec0db0ac9adeab663fa18f2d93eb9a42e4302b]]]
Former-commit-id: dc60f94a34
Former-commit-id: a75c66778b [formerly ef92804824]
Former-commit-id: d9573cb7ca
|
2013-10-10 17:38:01 -05:00 |
|
Ben Steffensmeier
|
c51d801aef
|
Issue #2376 Fix STI parsing
Change-Id: Ifcf0829f187a2fb96258cb3706e52bb1ba725fe5
Former-commit-id: 29f3ac17f1 [formerly abf0df45c4] [formerly 29f3ac17f1 [formerly abf0df45c4] [formerly f1699b1d62 [formerly 4af47a67091e0249c01289f275d44756f04e50d3]]]
Former-commit-id: f1699b1d62
Former-commit-id: 9066930aec [formerly 5abf856ccb]
Former-commit-id: 799629c7c6
|
2013-10-10 15:47:54 -05:00 |
|
Lee Venable
|
334fc2ce6b
|
Merge "Issue #2464 - fixed font memory leak." into development
Former-commit-id: e337b90ba5 [formerly 3a611d3f4f] [formerly e337b90ba5 [formerly 3a611d3f4f] [formerly feb40aada0 [formerly 5765e3fb4ee0f7305e5ec6240caeec375dd985a9]]]
Former-commit-id: feb40aada0
Former-commit-id: 93b93a6750 [formerly dc31709252]
Former-commit-id: ff8eebf909
|
2013-10-10 15:29:28 -05:00 |
|
Lee Venable
|
e85f79ec82
|
Merge "Issue #2428. Fixed memory leak for Regions" into development
Former-commit-id: 10c5920b90 [formerly aa27b764ca] [formerly 10c5920b90 [formerly aa27b764ca] [formerly 6282814c91 [formerly 29dd5dbf962cace42e38999f075aaaa57e24f3fc]]]
Former-commit-id: 6282814c91
Former-commit-id: 00f14ba5da [formerly fb37fddffa]
Former-commit-id: f3c7750f8e
|
2013-10-10 15:26:04 -05:00 |
|
Nate Jensen
|
0825384144
|
Merge "Issue #2361 remove ISerializableObject for hydro colors" into development
Former-commit-id: 59e0414d4d [formerly 7ca0f9a251] [formerly 59e0414d4d [formerly 7ca0f9a251] [formerly c6a8eaa841 [formerly 25c12b40a85db7a4e968dccb57798aaacb089b64]]]
Former-commit-id: c6a8eaa841
Former-commit-id: 8f686c0d94 [formerly 81d1faa5d4]
Former-commit-id: 918f7be44d
|
2013-10-10 15:07:34 -05:00 |
|
Slav Korolev
|
4dffa06efc
|
Issue #2428. Fixed memory leak for Regions
Former-commit-id: 2c4730db16 [formerly cab603ba36] [formerly 2c4730db16 [formerly cab603ba36] [formerly 0021d53557 [formerly 899d1f6371d55056af747d8bf6dee99d0c4179c9]]]
Former-commit-id: 0021d53557
Former-commit-id: bd225735ff [formerly 3631bfbeba]
Former-commit-id: 0babca9d58
|
2013-10-10 14:09:37 -04:00 |
|
Bryan Kowal
|
a0c583ceb6
|
Issue #2402 - re-compile 32-bit grib2.so
Former-commit-id: 410b9b6669 [formerly 05954f89b8] [formerly 410b9b6669 [formerly 05954f89b8] [formerly 3eee9edb58 [formerly e70561d259082645390f95df823ad4583aea8bbe]]]
Former-commit-id: 3eee9edb58
Former-commit-id: c79a66452b [formerly c7381d7ce2]
Former-commit-id: 8553bbc350
|
2013-10-10 12:49:49 -05:00 |
|
Richard Peter
|
2ee7444aa7
|
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: e717ae510b [formerly 8f67035519] [formerly e717ae510b [formerly 8f67035519] [formerly d7db5d0219 [formerly 3a704d8d903afc5629a13f478af585947954b5d2]]]
Former-commit-id: d7db5d0219
Former-commit-id: 3fec426da2 [formerly 6eae16a7dc]
Former-commit-id: 0eba27543b
|
2013-10-10 11:34:11 -05:00 |
|
Bryan Kowal
|
f452978591
|
Issue #2297 - fix 14.2.1 qpid build
Former-commit-id: a8dfd1ef01 [formerly 9d7ad6908a] [formerly a8dfd1ef01 [formerly 9d7ad6908a] [formerly 584d8b2ae4 [formerly 7863a68ae1c67188450ab7c3a9cc2c912533300c]]]
Former-commit-id: 584d8b2ae4
Former-commit-id: a4ea738a10 [formerly be0d60134b]
Former-commit-id: e12cae21f4
|
2013-10-10 11:21:11 -05:00 |
|
Richard Peter
|
bb9f61c6c2
|
Merge "Issue #2466 Returned to original harvesterThreadPool Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d" into development
Former-commit-id: f03832c79b [formerly a3e361323c] [formerly f03832c79b [formerly a3e361323c] [formerly fde5182264 [formerly 2d49ceead68df56e96c38652ab1c7df543f0f6d5]]]
Former-commit-id: fde5182264
Former-commit-id: ab702730a1 [formerly 825b01404e]
Former-commit-id: 76c4d346b6
|
2013-10-10 11:05:45 -05:00 |
|
Nate Jensen
|
5d533a8026
|
Issue #2361 remove ISerializableObject for hydro colors
Change-Id: Icc4a1e2ebff06ff389e95563406176663000ad7c
Former-commit-id: 472c2693c4 [formerly 0fe5979eac] [formerly 472c2693c4 [formerly 0fe5979eac] [formerly 83fafc638b [formerly f23474913e08b34d1eb82e2106549f57fd36538c]]]
Former-commit-id: 83fafc638b
Former-commit-id: 91ddf05a6b [formerly 7fb250b184]
Former-commit-id: 2e6998e999
|
2013-10-10 10:57:59 -05:00 |
|
Dave Hladky
|
7b70e44b71
|
Issue #2466 Returned to original harvesterThreadPool
Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d
Former-commit-id: 36667033b2 [formerly 38a6b4e811] [formerly 36667033b2 [formerly 38a6b4e811] [formerly e6931e8454 [formerly 26316e71831c51e3ee96a1afd9ef213f1d87beff]]]
Former-commit-id: e6931e8454
Former-commit-id: edec7221f4 [formerly 750b8aa13e]
Former-commit-id: 05c7fc4f2d
|
2013-10-10 10:47:44 -05:00 |
|
Nate Jensen
|
834f647a55
|
Merge "Issue #2361 remove ISerializableObject for some pointdata and user roles classes" into development
Former-commit-id: 55d1d12c38 [formerly b3fdf129db] [formerly 55d1d12c38 [formerly b3fdf129db] [formerly 2934222c09 [formerly 7a2dd6ccb98c9b7b28b989835b6ed6535f7a6ce1]]]
Former-commit-id: 2934222c09
Former-commit-id: 2c9dcd242b [formerly ed0c5355c5]
Former-commit-id: 424dd26cb8
|
2013-10-10 10:09:46 -05:00 |
|
Bryan Kowal
|
18a89d5e91
|
Fix Merge Issue.
Former-commit-id: 62db4d7b07 [formerly 21df04ff39] [formerly 62db4d7b07 [formerly 21df04ff39] [formerly db25d33a4d [formerly 91716e4f6eb81153afa48266cdd43e3239864301]]]
Former-commit-id: db25d33a4d
Former-commit-id: e130d1ce58 [formerly 1263d95220]
Former-commit-id: 2d978376ca
|
2013-10-10 10:04:26 -05:00 |
|
Steve Harris
|
2dc7de0754
|
13.5.2-9 baseline
Former-commit-id: fdbef0e663 [formerly a28a2d3041] [formerly fdbef0e663 [formerly a28a2d3041] [formerly f36cf09d21 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]
Former-commit-id: f36cf09d21
Former-commit-id: 7d0416293f [formerly 45c58e1cb3]
Former-commit-id: be3a804cf5
|
2013-10-10 10:55:20 -04:00 |
|
Lee Venable
|
04c2ea53e9
|
Issue #2464 - fixed font memory leak.
Former-commit-id: e3f44d751a [formerly 1a693c5d35] [formerly e3f44d751a [formerly 1a693c5d35] [formerly e1adc2e4be [formerly eceb0ab9c7ddc0d28d5452d9bf77888b9e58a9ac]]]
Former-commit-id: e1adc2e4be
Former-commit-id: 1b9ed84e9c [formerly b98e10fe06]
Former-commit-id: b4ceef0f22
|
2013-10-10 09:48:55 -05:00 |
|
Slav Korolev
|
3271455caf
|
Issue #2427. Fixed memory leak for images
Former-commit-id: 5dcf4a00bc [formerly 012497bfef] [formerly 5dcf4a00bc [formerly 012497bfef] [formerly f0aba7be10 [formerly 770bfd43e07cd92c2c8a3d7b3d1a07eb6d8b1052]]]
Former-commit-id: f0aba7be10
Former-commit-id: 09f00e1d81 [formerly 0b08d2bb0e]
Former-commit-id: 001a2d3cfc
|
2013-10-10 09:34:24 -04:00 |
|
Bryan Kowal
|
53a110866d
|
Issue #2422 - recompile updated grib2.so for RHEL6
Former-commit-id: 585f63e88c [formerly 9c3c123631] [formerly 585f63e88c [formerly 9c3c123631] [formerly bb9b1e4279 [formerly ae2923791512c7488805c19a773390ef1de5150b]]]
Former-commit-id: bb9b1e4279
Former-commit-id: 80127ae62d [formerly 9d57206173]
Former-commit-id: 49c19e4bb6
|
2013-10-09 18:38:58 -05:00 |
|
Nate Jensen
|
9c2532f01b
|
Issue #2361 remove ISerializableObject for some pointdata and user roles classes
Change-Id: I8a4a53dd1139a376aaa001bb7fef38444d8db005
Former-commit-id: 5c185a4ec2 [formerly 0cff122d9c] [formerly 5c185a4ec2 [formerly 0cff122d9c] [formerly d635901828 [formerly 3fa7b3de6733842c240959030023e84c844ef760]]]
Former-commit-id: d635901828
Former-commit-id: d6c42a4edd [formerly 25b219c49f]
Former-commit-id: 0821d5dc52
|
2013-10-09 18:03:11 -05:00 |
|
Brad Gonzales
|
af191df5cf
|
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: 59f22b866a [formerly 73e757c284] [formerly 59f22b866a [formerly 73e757c284] [formerly 61448cc04a [formerly f776626738e4cc995bb16e87b8da66ff90289bd8]]]
Former-commit-id: 61448cc04a
Former-commit-id: aff77aa148 [formerly 55d242b86d]
Former-commit-id: b24299e301
|
2013-10-09 17:58:12 -05:00 |
|
Bryan Kowal
|
d65db49046
|
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: 82559064ef [formerly 37d1dd492b] [formerly 82559064ef [formerly 37d1dd492b] [formerly 2b26c4c242 [formerly 2e6b76af19b308392e90dfee4c950200ec5c2560]]]
Former-commit-id: 2b26c4c242
Former-commit-id: 68434c23ef [formerly daeb4b7ecb]
Former-commit-id: f31f6ea11d
|
2013-10-09 17:07:10 -05:00 |
|
David Gillingham
|
47ff31848c
|
Issue #2418: Fix parameter naming issue in PHISH parameter info file.
Change-Id: I96dc326eba20ffa7c267248fd12343347e1ea93b
Former-commit-id: 5e2157c933 [formerly dda31532a4] [formerly 5e2157c933 [formerly dda31532a4] [formerly d0091e0f84 [formerly c1244e64aeeda450462592bb46ea6bede17ee219]]]
Former-commit-id: d0091e0f84
Former-commit-id: 2ae3f7b9f3 [formerly 303a8802ef]
Former-commit-id: 9fb19d2b4c
|
2013-10-09 14:44:55 -05:00 |
|
Ron Anderson
|
bc4bd47b90
|
Merge "Issue #2418: Add display support for pSurge 2.0 data in GFE." into development
Former-commit-id: e8e47e87b0 [formerly f3118d421c] [formerly e8e47e87b0 [formerly f3118d421c] [formerly d66c9d7322 [formerly 3b0b5e51da60b3b5d347d7325be376abb5902da8]]]
Former-commit-id: d66c9d7322
Former-commit-id: 5812db03e2 [formerly 5cea601f85]
Former-commit-id: 5b27c23897
|
2013-10-09 14:00:21 -05:00 |
|
Bryan Kowal
|
a57eee1184
|
Issue #2423 - Windows Java 7 Updates. Note: AWIPSII.Environment is not an Eclipse plugin project
Former-commit-id: 0ea8a8b08c [formerly 7881af2c69] [formerly 0ea8a8b08c [formerly 7881af2c69] [formerly 0bbf1cd01f [formerly db5f7bf2c2cc1abae67462a78a2b52fe0bc1f3fa]]]
Former-commit-id: 0bbf1cd01f
Former-commit-id: 1ecf059cd7 [formerly 697cde0f3a]
Former-commit-id: ae96da2f88
|
2013-10-09 13:26:27 -05:00 |
|
Richard Peter
|
bb0bd3fe2c
|
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: 62b322c18d [formerly 1a664aed21] [formerly 62b322c18d [formerly 1a664aed21] [formerly c0643db0ba [formerly fee86c220c12c09c714245fa8666bc08f4f9775b]]]
Former-commit-id: c0643db0ba
Former-commit-id: 1c74c3cbde [formerly ecba2f7317]
Former-commit-id: 93c2c93969
|
2013-10-09 13:14:06 -05:00 |
|
Richard Peter
|
28ae696899
|
Merge "Issue #2402 Modify grib decoder to work on file extents. Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9" into development
Former-commit-id: fcb0b32ae2 [formerly d8df407119] [formerly fcb0b32ae2 [formerly d8df407119] [formerly 117c82a06d [formerly 06caa25b31163ceb228982fc7e5e51b5bc8f33a0]]]
Former-commit-id: 117c82a06d
Former-commit-id: 52c9791172 [formerly a6f7a7ca7f]
Former-commit-id: 5eaa25b609
|
2013-10-09 13:13:18 -05:00 |
|
Nate Jensen
|
ef28261133
|
Merge "Issue #2457 Improve error messages for missing radar icao." into development
Former-commit-id: 1d3742a979 [formerly 4b541c4c23] [formerly 1d3742a979 [formerly 4b541c4c23] [formerly e8f53dd99a [formerly e67b29df638e59b18e552d1e596034f70d08adbc]]]
Former-commit-id: e8f53dd99a
Former-commit-id: 1a0df35030 [formerly b21799b783]
Former-commit-id: 7081eafc36
|
2013-10-09 13:10:28 -05:00 |
|
Ben Steffensmeier
|
870631902b
|
Issue #2402 Modify grib decoder to work on file extents.
Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9
Former-commit-id: c896c9bf30 [formerly 7d2b48de48] [formerly c896c9bf30 [formerly 7d2b48de48] [formerly 2b089b0848 [formerly 1525772d1b42348f0eca78fc966d2c7878496ea7]]]
Former-commit-id: 2b089b0848
Former-commit-id: 7c6a89b623 [formerly 633a075052]
Former-commit-id: 839c602669
|
2013-10-09 12:50:02 -05:00 |
|
Ben Steffensmeier
|
236be63083
|
Issue #2457 Improve error messages for missing radar icao.
Former-commit-id: c43f3e11a6 [formerly 52beccc5c9] [formerly c43f3e11a6 [formerly 52beccc5c9] [formerly 7c8a3b80fa [formerly ef0680d3f4acfa64d90af2e074f6642d1386d3ab]]]
Former-commit-id: 7c8a3b80fa
Former-commit-id: 18c59f3573 [formerly 070e2cfdac]
Former-commit-id: 2edbb6e665
|
2013-10-09 12:11:27 -05:00 |
|
Lee Venable
|
965c691200
|
Issue #2447 - fixed color memory leak.
Former-commit-id: 91cafa3d45 [formerly 527f88ddac] [formerly 91cafa3d45 [formerly 527f88ddac] [formerly 8d341f499d [formerly fe59f0923caa13c089edb683611b986522476539]]]
Former-commit-id: 8d341f499d
Former-commit-id: 481bc0875e [formerly 717ba7e08e]
Former-commit-id: 409370108d
|
2013-10-09 10:07:37 -05:00 |
|
Nate Jensen
|
4988c3b715
|
Merge "Issue #2402 Make PythonDecoder more extendable." into development
Former-commit-id: e0cbf2e05f [formerly 7cecf177fe] [formerly e0cbf2e05f [formerly 7cecf177fe] [formerly 2d25d9e46a [formerly 3daa3f8284a5a65657429503c055ab34c1ebfb48]]]
Former-commit-id: 2d25d9e46a
Former-commit-id: c026672fe1 [formerly 9ca9bd05a0]
Former-commit-id: 75f9f891a7
|
2013-10-08 16:20:43 -05:00 |
|
Bryan Kowal
|
d10a370207
|
Merge "Issue #2033 - windows build updates for etc directory deployment" into development
Former-commit-id: 00f1a83966 [formerly f6e6932434] [formerly 00f1a83966 [formerly f6e6932434] [formerly 7ddd665597 [formerly 3a1e9baf2c593ee99f9b0299debceafab653fc46]]]
Former-commit-id: 7ddd665597
Former-commit-id: 5e114e4f5d [formerly 6a33ba460f]
Former-commit-id: 78e7109310
|
2013-10-08 15:38:20 -05:00 |
|
Bryan Kowal
|
93dbbc2321
|
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: bb5ef114d1 [formerly aa4ea792c1] [formerly bb5ef114d1 [formerly aa4ea792c1] [formerly 542f5f2349 [formerly 606030384b5fe1eb9411d4b35d3282b15b1398b4]]]
Former-commit-id: 542f5f2349
Former-commit-id: de61382dc7 [formerly 5d5ccb7599]
Former-commit-id: 86f7af5968
|
2013-10-08 14:44:38 -05:00 |
|
Richard Peter
|
372b951488
|
Merge "Issue #2442 Case creation no longer contains category directory." into omaha_13.5.3
Former-commit-id: a7a3df7894 [formerly 2822583c3d] [formerly a7a3df7894 [formerly 2822583c3d] [formerly d409715b41 [formerly 68f0f992a67d4fd523cf91b492fd9c2c56573f65]]]
Former-commit-id: d409715b41
Former-commit-id: 2e4f22c5f0 [formerly c0a36a1f5c]
Former-commit-id: eefd87ec34
|
2013-10-08 14:32:28 -05:00 |
|
Richard Peter
|
bc32641181
|
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: f141fdd5ab [formerly 9adbe25ceb] [formerly f141fdd5ab [formerly 9adbe25ceb] [formerly b6395cc834 [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]
Former-commit-id: b6395cc834
Former-commit-id: 0e7dccd18f [formerly 3abe952ca0]
Former-commit-id: 1895c9f914
|
2013-10-08 10:59:50 -05:00 |
|
Richard Peter
|
b2b7521cab
|
Merge "Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects" into development
Former-commit-id: f7ae6aae92 [formerly 28760a1273] [formerly f7ae6aae92 [formerly 28760a1273] [formerly 7a4ed8bea4 [formerly fd76d3a72bd18a2afdce5855173a5a9b9ad9e00b]]]
Former-commit-id: 7a4ed8bea4
Former-commit-id: f28a0c025e [formerly 0b1f6e2c9b]
Former-commit-id: 9abed1e51e
|
2013-10-08 10:50:59 -05:00 |
|
Roger Ferrel
|
1759da2158
|
Issue #2438 Changes to properly load and save retentions times.
Change-Id: I05a516f1728ad3340547d43da025c6227d7b5551
Former-commit-id: a393894c67 [formerly d0f7e12518] [formerly a393894c67 [formerly d0f7e12518] [formerly 0ee16e8524 [formerly c3a887ca435140ec8cd944da1afa417ad45ea3c6]]]
Former-commit-id: 0ee16e8524
Former-commit-id: fd96bef170 [formerly 1ba0b3f411]
Former-commit-id: 1784d0d0c0
|
2013-10-08 10:48:42 -05:00 |
|
Bryan Kowal
|
b8c2ece19c
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: 96c800f3f4 [formerly 5eba3290c8] [formerly 96c800f3f4 [formerly 5eba3290c8] [formerly 8f14318bc7 [formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]]
Former-commit-id: 8f14318bc7
Former-commit-id: 72ed6c5f7a [formerly 53af4c7284]
Former-commit-id: 5477a06781
|
2013-10-08 10:35:03 -05:00 |
|
Lee Venable
|
7d3285a04a
|
Merge "Issue #2443 - fixed image memory leak." into development
Former-commit-id: 766190493e [formerly 18845668a6] [formerly 766190493e [formerly 18845668a6] [formerly ea27ffd4a3 [formerly 1ef7b46cb407dfebbf010a4b59bea8d8ef3eb595]]]
Former-commit-id: ea27ffd4a3
Former-commit-id: ec38285d85 [formerly 664971b75b]
Former-commit-id: c775ac006f
|
2013-10-08 10:33:03 -05:00 |
|
Dave Hladky
|
de24cf3b9a
|
Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects
Former-commit-id: 4867082be1 [formerly fbe4078bc5] [formerly 4867082be1 [formerly fbe4078bc5] [formerly ad1bb73c70 [formerly c299ed7a5bb02980ecb30b0ab38752d2878d50a7]]]
Former-commit-id: ad1bb73c70
Former-commit-id: 445d836fe6 [formerly 093b41499b]
Former-commit-id: 7807722694
|
2013-10-08 10:25:36 -05:00 |
|