Commit graph

2443 commits

Author SHA1 Message Date
Mike Duff
5933d330b9 Issue #2477 - Fix bug in group settings in create sub dlg.
Change-Id: I32921ec989bb72cfbaea898af5b696c18d514f4c

Former-commit-id: 78e2aab777 [formerly 9e2a8a0e04] [formerly 1485ddd779] [formerly a9c8797e9e [formerly 1485ddd779 [formerly 6111ef3dacff5be7f3fa80334553646b988b60d2]]]
Former-commit-id: a9c8797e9e
Former-commit-id: 50ee7818c09a698535754beff5d683b662eb6675 [formerly 7dd6e09fe1]
Former-commit-id: 367b98e07f
2013-10-15 11:18:52 -05:00
Richard Peter
93000196be Issue #2389: Update NotificationManagerJob
Change-Id: I3fa926a78a50e9cb6fba7ed98c6560528e3cd7e6

Former-commit-id: 50604d4510 [formerly 88ecc1c34f] [formerly 5365515f28] [formerly f84c7e9607 [formerly 5365515f28 [formerly dbf2c35fcae26d261827758318f712641937d989]]]
Former-commit-id: f84c7e9607
Former-commit-id: 924a10958d9381d9077f1691ced1188d3bbab299 [formerly 9da7b5bd5f]
Former-commit-id: 1a999c52c2
2013-10-15 11:07:51 -05:00
Richard Peter
aef98d5342 Merge "Issue #2473 Remove deprecated grib functionality Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23" into development
Former-commit-id: 7068ab9e88 [formerly 8f54e49398] [formerly 48b3816b84] [formerly 2d0bb0b56b [formerly 48b3816b84 [formerly 6ce82e330ef6caa5defd9252458a4b81b087d64d]]]
Former-commit-id: 2d0bb0b56b
Former-commit-id: 5c8366a821b77ac3e8b3d1bba8cee7c7d0b876ca [formerly ef49a322f2]
Former-commit-id: 60e49cf211
2013-10-15 10:49:13 -05:00
Ben Steffensmeier
253ada50d5 Issue #2473 Remove deprecated grib functionality
Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23

Former-commit-id: d5eaefeeed [formerly c22ccb6c4c] [formerly cfc8bb859f] [formerly 94560e37c8 [formerly cfc8bb859f [formerly 9d903e94114cacee2a6abec6f83880fa8b978180]]]
Former-commit-id: 94560e37c8
Former-commit-id: f70cf023d739b92df09c9ab8e0c52a3bc0acf093 [formerly 2e0698aa06]
Former-commit-id: c960405800
2013-10-15 10:48:29 -05:00
Mike Duff
4b3f55662c Issue #2386 - Fix for editing subscriptions from subscription manager dlg.
Change-Id: I0d5532648456cc1a0960fb14e9115c52d4478682

Former-commit-id: e549346353 [formerly 3ac5ba498a] [formerly 15fe243ebc] [formerly 65c693d5c4 [formerly 15fe243ebc [formerly f32286059bfc661408ab16d8a6a118beffe0ce17]]]
Former-commit-id: 65c693d5c4
Former-commit-id: b2ab42e078ad49f585ba986c8d78ecffb7953af6 [formerly a49af4489e]
Former-commit-id: 7bcffa5275
2013-10-15 09:52:08 -05:00
Nate Jensen
95f1de78e5 Merge "Issue #2386 - DD Front end refactor Peer review comments Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f" into development
Former-commit-id: 2c3d286eb2 [formerly b1d4d2d9ef] [formerly baac431d85] [formerly 23e1817385 [formerly baac431d85 [formerly c3550fa64755f73ee2a23080a0f786a2f170e6ae]]]
Former-commit-id: 23e1817385
Former-commit-id: f7e467ca19c87bc093a0933e116c7732cad75cd7 [formerly 7cdd1071cf]
Former-commit-id: eabc32a720
2013-10-14 16:26:47 -05:00
Mike Duff
5913f21dd6 Issue #2386 - DD Front end refactor
Peer review comments
Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f

Former-commit-id: 335c8ba871 [formerly 9b4daacb26] [formerly 33a5d36e1c] [formerly 83ec4daee2 [formerly 33a5d36e1c [formerly a72c1f9ad09594ddc0c0e78e78c9fccd95fd49ff]]]
Former-commit-id: 83ec4daee2
Former-commit-id: 177f4fe62912fc601fc1693ee37ceb0e687c8033 [formerly 4764147f67]
Former-commit-id: c4e3b900c9
2013-10-14 15:42:28 -05:00
Nate Jensen
9d1df167be Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: 2fb28dce46 [formerly d7e4576380] [formerly b49a2ceb2f] [formerly 40847d0edf [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]]
Former-commit-id: 40847d0edf
Former-commit-id: 354b93b5a9315917fe3ed51f812147bc484eb332 [formerly 9e4100b0e1]
Former-commit-id: d84f47b609
2013-10-14 15:30:09 -05:00
Lee Venable
bdbbcbb36a Issue #2474 - Fixed font memory leak.
Former-commit-id: 4d3e1ef28c [formerly 7defe1efea] [formerly a9b8c2a2fe] [formerly f3a9e541a1 [formerly a9b8c2a2fe [formerly a8a78efd01f8f3ed0ee533d4eeeb9e3463d3c0f2]]]
Former-commit-id: f3a9e541a1
Former-commit-id: 6f2af17028bd11945c433b0da741649b7233a683 [formerly 36176665ff]
Former-commit-id: 87e40ae6b1
2013-10-14 12:42:27 -05:00
Nate Jensen
0059665def Merge "Issue #2441 Initialize python interpreter asynchronously when opening localization perspective." into development
Former-commit-id: d8bd120a11 [formerly b328e8dec5] [formerly 96463c6117296ffe71df938350471c29d4b82158 [formerly abf2fa50b7]] [formerly 93c67d2d8c [formerly abf2fa50b7 [formerly 97ac5b996bc54d949f03e6ea0f0952207e10366c]]]
Former-commit-id: 93c67d2d8c
Former-commit-id: 45e15e042c739b95e6ced767efd83fd862f635d1 [formerly 85af27444f]
Former-commit-id: 48445dd8cf
2013-10-14 11:42:23 -05:00
Richard Peter
6a0020cf1c Merge "Issue #2386 - Implement the front end for multiple data type overlap rules Peer review comments" into development
Former-commit-id: e1ba2afa4c [formerly 1f772816de] [formerly d8b49516dc] [formerly c056c93104 [formerly d8b49516dc [formerly 581cc8e7319216c910e71936820f7414d2281fed]]]
Former-commit-id: c056c93104
Former-commit-id: 5a35bd165eea54bab27de852d18ba49301eed727 [formerly eb1ed4cda6]
Former-commit-id: b6d6458ab2
2013-10-14 11:15:40 -05:00
Steve Harris
cc5e19f181 Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: d455ad79ce [formerly 1581adfa64] [formerly 852c02c848] [formerly 545d7ca463 [formerly 852c02c848 [formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]]]
Former-commit-id: 545d7ca463
Former-commit-id: 519ff37a80328281e8c99f985371e3ec85b3bee0 [formerly 5cf3cc1efc]
Former-commit-id: 2f0968a279
2013-10-14 09:28:24 -05:00
Steve Harris
99dac05b85 13.5.2-10 baseline
Former-commit-id: 2f59153a18 [formerly 1efbba7a4b] [formerly 46c351de6c] [formerly c3d29c0fa0 [formerly 46c351de6c [formerly 83863a9833f309203af0ee34d503bf280e596397]]]
Former-commit-id: c3d29c0fa0
Former-commit-id: 908adf82a3e2b56f5c1b086392c40f7024701459 [formerly 5f86804c81]
Former-commit-id: d1f38eb936
2013-10-14 09:59:31 -04:00
Mike Duff
27fd5ba0fa Issue #2386 - Implement the front end for multiple data type overlap rules
Peer review comments

Change-Id: I1f0186b3e08f3013a6dc4dc3dbf7c2e0a19404bf

Former-commit-id: 10f3fa86b0 [formerly c4e501aaf9] [formerly a220ff05b0] [formerly a69120c623 [formerly a220ff05b0 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]]]
Former-commit-id: a69120c623
Former-commit-id: 5c24818dd9e96881368fc526e9d32dce344061c7 [formerly f9074dc896]
Former-commit-id: 610c937a00
2013-10-11 18:18:18 -05:00
Ben Steffensmeier
44613a0c61 Issue #2441 Initialize python interpreter asynchronously when opening localization perspective.
Former-commit-id: a1fe58b934 [formerly ccf8a88f17] [formerly 89eb327bf0] [formerly c5d49b2a4c [formerly 89eb327bf0 [formerly 7d9312fbedf734f973401e21445448646ff67410]]]
Former-commit-id: c5d49b2a4c
Former-commit-id: 5b606b351636990de687695ed10f65eb3cc717ee [formerly c38c7d654c]
Former-commit-id: ae94d39ce2
2013-10-11 16:25:28 -05:00
Lee Venable
ca1a404c58 Merge "Issue #2471 - fixed color memory leak." into development
Former-commit-id: 64b05d759b [formerly 16e5a0223a] [formerly 3b98dc699c] [formerly 06a38bd123 [formerly 3b98dc699c [formerly 1cb4839c1115ff4e65dcfd27377f81af7795ddd0]]]
Former-commit-id: 06a38bd123
Former-commit-id: 4bec7eb59e1ff363c471cbf14905ea948580bf90 [formerly 82556ab7ec]
Former-commit-id: 3e95f8feb8
2013-10-11 13:02:35 -05:00
Nate Jensen
d3e361eaa4 Merge "Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104." into development
Former-commit-id: 568e5bd9f6 [formerly c6c2f50562] [formerly 8208d756c7] [formerly d5d0fab53b [formerly 8208d756c7 [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]]
Former-commit-id: d5d0fab53b
Former-commit-id: bed476bf2460c8360b48e732fa9f1b178615b422 [formerly a34777a738]
Former-commit-id: fd3a19a73c
2013-10-11 11:21:18 -05:00
Lee Venable
ffe192037c Issue #2471 - fixed color memory leak.
Former-commit-id: 0cadf82e88 [formerly 97b3c7af6b] [formerly bceb4d76bf] [formerly 61e5d5e4da [formerly bceb4d76bf [formerly a573bacadd4d9b3ea0058bb70b348372b6a21cc9]]]
Former-commit-id: 61e5d5e4da
Former-commit-id: 1e2a3f588e15979f96d0306e26a250a064445b33 [formerly 107b35761b]
Former-commit-id: cec4aecdaa
2013-10-11 11:09:57 -05:00
Brad Gonzales
ff0ec3ddc6 Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
       Fix GriddedTime addCycles when cycles are empty.

Change-Id: I9fa27178e5f59252cb872314493256be7f038890

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

Change-Id: I78649dd0268b030624888544740a8d7af3e83e97

Former-commit-id: c2471fd381 [formerly b64050ff1e] [formerly 7a66a3c995] [formerly 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]]
Former-commit-id: 01c0e022d5
Former-commit-id: d2fa57de0fb4cdcad01f1ef6e1a474065d10bc48 [formerly cf0ad44ee3]
Former-commit-id: dfd6ffabd8
2013-10-11 10:21:37 -05:00
Lee Venable
2174aea7fc Merge "Issue #2464 - fixed font memory leak." into development
Former-commit-id: 442865a5f3 [formerly e337b90ba5] [formerly 3a611d3f4f] [formerly feb40aada0 [formerly 3a611d3f4f [formerly 5765e3fb4ee0f7305e5ec6240caeec375dd985a9]]]
Former-commit-id: feb40aada0
Former-commit-id: e25d2128e67f303ef6dec71f641474d70e4d5040 [formerly dc31709252]
Former-commit-id: 93b93a6750
2013-10-10 15:29:28 -05:00
Lee Venable
1fa0a9e763 Merge "Issue #2428. Fixed memory leak for Regions" into development
Former-commit-id: e2cb973876 [formerly 10c5920b90] [formerly aa27b764ca] [formerly 6282814c91 [formerly aa27b764ca [formerly 29dd5dbf962cace42e38999f075aaaa57e24f3fc]]]
Former-commit-id: 6282814c91
Former-commit-id: 93a1856b5ba4c4002a11e6208f64b92373243999 [formerly fb37fddffa]
Former-commit-id: 00f14ba5da
2013-10-10 15:26:04 -05:00
Nate Jensen
b3a270b699 Merge "Issue #2361 remove ISerializableObject for hydro colors" into development
Former-commit-id: 9edf04647a [formerly 59e0414d4d] [formerly 7ca0f9a251] [formerly c6a8eaa841 [formerly 7ca0f9a251 [formerly 25c12b40a85db7a4e968dccb57798aaacb089b64]]]
Former-commit-id: c6a8eaa841
Former-commit-id: e7fcbe3bbb07cea6cb476be72d6239106fca7335 [formerly 81d1faa5d4]
Former-commit-id: 8f686c0d94
2013-10-10 15:07:34 -05:00
Slav Korolev
74fb9bb36c Issue #2428. Fixed memory leak for Regions
Former-commit-id: 2b29184b21 [formerly 2c4730db16] [formerly cab603ba36] [formerly 0021d53557 [formerly cab603ba36 [formerly 899d1f6371d55056af747d8bf6dee99d0c4179c9]]]
Former-commit-id: 0021d53557
Former-commit-id: 14b3866029e9725abb0c7991b69a2bf28a11dd22 [formerly 3631bfbeba]
Former-commit-id: bd225735ff
2013-10-10 14:09:37 -04:00
Richard Peter
7dc72f9bba Merge "Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes." into development
Former-commit-id: a4b1eb9dff [formerly e717ae510b] [formerly 8f67035519] [formerly d7db5d0219 [formerly 8f67035519 [formerly 3a704d8d903afc5629a13f478af585947954b5d2]]]
Former-commit-id: d7db5d0219
Former-commit-id: 68223945005706fda2640591654c8d7d4815f98e [formerly 6eae16a7dc]
Former-commit-id: 3fec426da2
2013-10-10 11:34:11 -05:00
Nate Jensen
4454f61a27 Issue #2361 remove ISerializableObject for hydro colors
Change-Id: Icc4a1e2ebff06ff389e95563406176663000ad7c

Former-commit-id: 54a13cef30 [formerly 472c2693c4] [formerly 0fe5979eac] [formerly 83fafc638b [formerly 0fe5979eac [formerly f23474913e08b34d1eb82e2106549f57fd36538c]]]
Former-commit-id: 83fafc638b
Former-commit-id: 67c022fe0bf860e2b4d22e1b1209c2a4000de21f [formerly 7fb250b184]
Former-commit-id: 91ddf05a6b
2013-10-10 10:57:59 -05:00
Steve Harris
13873d55c2 13.5.2-9 baseline
Former-commit-id: 0093ce47a8 [formerly fdbef0e663] [formerly a28a2d3041] [formerly f36cf09d21 [formerly a28a2d3041 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]
Former-commit-id: f36cf09d21
Former-commit-id: 9c502fedcbd501781ba7a8be644ea45c55cc5e52 [formerly 45c58e1cb3]
Former-commit-id: 7d0416293f
2013-10-10 10:55:20 -04:00
Lee Venable
6ac2e88aee Issue #2464 - fixed font memory leak.
Former-commit-id: 9c8d1471db [formerly e3f44d751a] [formerly 1a693c5d35] [formerly e1adc2e4be [formerly 1a693c5d35 [formerly eceb0ab9c7ddc0d28d5452d9bf77888b9e58a9ac]]]
Former-commit-id: e1adc2e4be
Former-commit-id: 5904fc15c7ce1db3e764a1a7c740a0ecbbe10705 [formerly b98e10fe06]
Former-commit-id: 1b9ed84e9c
2013-10-10 09:48:55 -05:00
Slav Korolev
a1e3716076 Issue #2427. Fixed memory leak for images
Former-commit-id: 815b2fb40d [formerly 5dcf4a00bc] [formerly c91df51c728a2df7e57ff49ccc29634b41c359b5 [formerly 012497bfef]] [formerly f0aba7be10 [formerly 012497bfef [formerly 770bfd43e07cd92c2c8a3d7b3d1a07eb6d8b1052]]]
Former-commit-id: f0aba7be10
Former-commit-id: 6d12d9ebc42f69dee6fac7843780d975a33617b7 [formerly 0b08d2bb0e]
Former-commit-id: 09f00e1d81
2013-10-10 09:34:24 -04:00
Brad Gonzales
74df786a0b 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 61448cc04a [formerly 73e757c284 [formerly f776626738e4cc995bb16e87b8da66ff90289bd8]]]
Former-commit-id: 61448cc04a
Former-commit-id: 3686551f045361598f2adaa4edad79f481b0d4e1 [formerly 55d242b86d]
Former-commit-id: aff77aa148
2013-10-09 17:58:12 -05:00
Lee Venable
32ddffea14 Issue #2447 - fixed color memory leak.
Former-commit-id: 4fd007cdb0 [formerly 91cafa3d45] [formerly 527f88ddac] [formerly 8d341f499d [formerly 527f88ddac [formerly fe59f0923caa13c089edb683611b986522476539]]]
Former-commit-id: 8d341f499d
Former-commit-id: a9303f9b91f65f21c748b5e607cdaa2dcbd3375d [formerly 717ba7e08e]
Former-commit-id: 481bc0875e
2013-10-09 10:07:37 -05:00
Richard Peter
146cbb29fc Merge "Issue #2442 Case creation no longer contains category directory." into omaha_13.5.3
Former-commit-id: 7dfa5a2ea3 [formerly a7a3df7894] [formerly 2822583c3d] [formerly d409715b41 [formerly 2822583c3d [formerly 68f0f992a67d4fd523cf91b492fd9c2c56573f65]]]
Former-commit-id: d409715b41
Former-commit-id: 29a8e32f9be08d61d7f6f95d67c55d6870c981b0 [formerly c0a36a1f5c]
Former-commit-id: 2e4f22c5f0
2013-10-08 14:32:28 -05:00
Richard Peter
873d2bf184 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 b6395cc834 [formerly 9adbe25ceb [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]
Former-commit-id: b6395cc834
Former-commit-id: 2c457acf95f4418fe275e09d6d24693aa278fc9b [formerly 3abe952ca0]
Former-commit-id: 0e7dccd18f
2013-10-08 10:59:50 -05:00
Roger Ferrel
789357a6d4 Issue #2438 Changes to properly load and save retentions times.
Change-Id: I05a516f1728ad3340547d43da025c6227d7b5551

Former-commit-id: 659313ad31 [formerly a393894c67] [formerly d0f7e12518] [formerly 0ee16e8524 [formerly d0f7e12518 [formerly c3a887ca435140ec8cd944da1afa417ad45ea3c6]]]
Former-commit-id: 0ee16e8524
Former-commit-id: 655bfac726411200a6012321c5084c55a8d6cb38 [formerly 1ba0b3f411]
Former-commit-id: fd96bef170
2013-10-08 10:48:42 -05:00
Roger Ferrel
d4fcf5732c Issue #2442 Case creation no longer contains category directory.
Change-Id: I1a3e87ed613923f1b1420e347ebf3db31f289bd0

Former-commit-id: 18d4157f3d [formerly 05f6e752f1] [formerly e8417dec61] [formerly db49df3fa3 [formerly e8417dec61 [formerly f008a95f617258d429a94d135664e8caf6ba1743]]]
Former-commit-id: db49df3fa3
Former-commit-id: d8066daf702a921d6408efe899109455b68dda5b [formerly 6aaf813365]
Former-commit-id: 5843250e09
2013-10-08 09:47:19 -05:00
Richard Peter
af9c4be87a 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 d9eae3ea28 [formerly 31c87ab01e [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]
Former-commit-id: d9eae3ea28
Former-commit-id: ff84474d44083bc5676fa6731229af076e27cb80 [formerly f4b47dda50]
Former-commit-id: 94d0913bd9
2013-10-08 09:45:27 -05:00
Lee Venable
fc98572a27 Issue #2443 - fixed image memory leak.
Former-commit-id: 7dae2b36cf [formerly 1021c25d9d] [formerly 0bacce33bc] [formerly 47f8200757 [formerly 0bacce33bc [formerly fccb24f5834dd746f6868b4390e3c17dd12dc729]]]
Former-commit-id: 47f8200757
Former-commit-id: 43dc0958942086502dfa768b01124fa7746d0abb [formerly cd63ee8644]
Former-commit-id: 03c4e9a287
2013-10-08 09:39:00 -05:00
Richard Peter
55c9d3f470 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 e2c7bb21d7 [formerly 2e062048e1 [formerly 204c2034a08cd69fc7286639f37e5ff936ecf49e]]]
Former-commit-id: e2c7bb21d7
Former-commit-id: 3a79334f10bfa880b8282cf69118ab055077d496 [formerly e43cd4b397]
Former-commit-id: 80dd506d10
2013-10-07 16:19:11 -05:00
Lee Venable
ca281660c6 Merge "Issue #2437 - fixed color memory leak." into development
Former-commit-id: 7321f4e61f [formerly 3bfe4bf45c] [formerly 5081bbd0ab] [formerly b1d02c6a49 [formerly 5081bbd0ab [formerly b7691a4e940cc3461a39cce871c6de15110bf1d1]]]
Former-commit-id: b1d02c6a49
Former-commit-id: e2df9e89f7153660d6c4bffe212ef2cb3e805d3e [formerly 4060fa7e0b]
Former-commit-id: ee63fc9004
2013-10-07 14:13:56 -05:00
Lee Venable
54975835b5 Merge "Issue #2421 optimize color map loading. Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304" into development
Former-commit-id: ccb9b15f8c [formerly f94bcf4776] [formerly eeee5c7948] [formerly c01eb85e53 [formerly eeee5c7948 [formerly 7139b6fe32b6de8c87c96e3b55d6ad83f11b149a]]]
Former-commit-id: c01eb85e53
Former-commit-id: 44f2874ed6741bb80dbe72b605f855a78f686c71 [formerly 72a6650958]
Former-commit-id: 18bbfeb4cb
2013-10-07 13:56:50 -05:00
Lee Venable
9502d31555 Issue #2437 - fixed color memory leak.
Former-commit-id: 4f5ee0dbcd [formerly 615fcc7f8e] [formerly 604f8f86a4] [formerly a4be7633a6 [formerly 604f8f86a4 [formerly f081bea82ced5931f8424d51994571d5a9971cfe]]]
Former-commit-id: a4be7633a6
Former-commit-id: e3d05cf966b9b910eaf401e19cf70c624f4713f0 [formerly b3efbb97c1]
Former-commit-id: 046a0a764d
2013-10-07 13:55:54 -05:00
Ben Steffensmeier
c476f76088 Issue #2421 optimize color map loading.
Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304

Former-commit-id: 4e37571a61 [formerly bae5c951d4] [formerly f4c616fbff] [formerly 4e998f2576 [formerly f4c616fbff [formerly ce15657bc794afe819d729121bc202b4f43b97d6]]]
Former-commit-id: 4e998f2576
Former-commit-id: 2ba961c0a05f3ff564c22df12d8a167d66547f34 [formerly 76c73c10af]
Former-commit-id: 8428550b79
2013-10-07 12:04:19 -05:00
Bryan Kowal
4cd2815705 Merge "Revert "Issue #2033 - pde and rpm build updates"" into development
Former-commit-id: cfd39d5e5c [formerly 6e05c00981] [formerly 0698d28222] [formerly 82d61b53d4 [formerly 0698d28222 [formerly 0fb325bd5a463c243b807fbe44d2499bc7fc814c]]]
Former-commit-id: 82d61b53d4
Former-commit-id: d267346cd6171a83369a2844a809a17c5af0f381 [formerly 551b501e2e]
Former-commit-id: 5cd20aed43
2013-10-07 11:52:58 -05:00
Lee Venable
82dc36a619 Merge "Issue #2436 - disposed of the sort color" into development
Former-commit-id: 3235852e78 [formerly 0eff818ede] [formerly c1991c5c66] [formerly 7bd1fec82e [formerly c1991c5c66 [formerly a087a06f19df47edc2b818d2f68e2eff5aab2b50]]]
Former-commit-id: 7bd1fec82e
Former-commit-id: 562ab2641867c75dba6e4590b19f96ce08f546ee [formerly bdd28e1e09]
Former-commit-id: a55d310ebe
2013-10-07 09:30:45 -05:00
Nate Jensen
b91262e079 Merge "Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject" into development
Former-commit-id: 8ed4f41938 [formerly be1385b705] [formerly adc774bee9] [formerly c36c50d189 [formerly adc774bee9 [formerly a686d702002a5e01389be1fd5e72558239687080]]]
Former-commit-id: c36c50d189
Former-commit-id: c894f0c1c606778947fd465b7a239d04dcad6edd [formerly 10ba6f231a]
Former-commit-id: 01997dd1fb
2013-10-07 09:30:31 -05:00
Lee Venable
ccbc44f9d3 Issue #2436 - disposed of the sort color
Former-commit-id: f27781b74e [formerly 8c8adf8be6] [formerly 9c97908f36] [formerly c4ddd46b44 [formerly 9c97908f36 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]]]
Former-commit-id: c4ddd46b44
Former-commit-id: b50a8d2a19218358b07a31a6ee2f605c0ead6152 [formerly 46db8998a6]
Former-commit-id: 2ed106cac4
2013-10-07 09:11:25 -05:00
Dave Hladky
87574fd68a Issue #1797 Separation of gridded time and abstract time object
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63

Former-commit-id: 7d43c5b7f9 [formerly 4d4d93fc0a] [formerly e0ec10d073] [formerly 1733834e74 [formerly e0ec10d073 [formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]]]
Former-commit-id: 1733834e74
Former-commit-id: 965f4a1eb5886ed77447541de327726ef9ab34a7 [formerly 89c341509c]
Former-commit-id: 21239525ea
2013-10-04 10:36:27 -05:00
Steve Harris
9e5ad5cd96 13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]
Former-commit-id: 18325949fb
Former-commit-id: 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9]
Former-commit-id: 21b84f0290
2013-10-04 11:30:03 -04:00
Bryan Kowal
020566233e Revert "Issue #2033 - pde and rpm build updates"
Undo copying localization into etc at build time.

This reverts commit 2cda5c37636a512f1a9ef3de04b0dac3ca31e120 [formerly 9a77e3553a] [formerly b344543d81 [formerly 33a9270304] [formerly 6023c61bca] [formerly 9a77e3553a [formerly 6023c61bca [formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]]]].


Former-commit-id: ab100bb5b1 [formerly a75ed2b079] [formerly bb2e914c00] [formerly 9d47e7565d [formerly bb2e914c00 [formerly f735b7bb3a0e23389be086d3582a2e0afdc95515]]]
Former-commit-id: 9d47e7565d
Former-commit-id: 4664dae5d08c4cc7ae160de4020c49d55f3b6503 [formerly 4d08d7a1c3]
Former-commit-id: d4eba48f94
2013-10-04 09:47:59 -05:00
Mike Duff
e1017e7ce8 Issue #2375 - Fix for set number of rows in notification center
Change-Id: I9f8b937265e77c9777313225ab83f71a81b46994

Former-commit-id: 354af07416 [formerly 80081ff25b] [formerly 865b5f6878] [formerly d258009cc7 [formerly 865b5f6878 [formerly 74327c92303fe846d7333d8760652dbcace2d45f]]]
Former-commit-id: d258009cc7
Former-commit-id: 1ac7599652efeecae27c7dd2a2b8782fc610c0bc [formerly 81bd77e56d]
Former-commit-id: 2261f9ff61
2013-10-04 09:27:30 -05:00