Brad Gonzales
|
c49808a723
|
Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
Fix GriddedTime addCycles when cycles are empty.
Change-Id: I9fa27178e5f59252cb872314493256be7f038890
Former-commit-id: 718fea35a1 [formerly ac3d87c397 ] [formerly 25710edd9e ] [formerly 718fea35a1 [formerly ac3d87c397 ] [formerly 25710edd9e ] [formerly bc87f2a168 [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]]]
Former-commit-id: bc87f2a168
Former-commit-id: ff0ec3ddc6 [formerly 5825fa41d6 ] [formerly 80e942a0903682ada751fb617334acdf3cd8b6d9 [formerly 897fdfc2f6 ]]
Former-commit-id: 0feb323650cbcacede4cba0bae1d36a86174332f [formerly 32dce367a9 ]
Former-commit-id: feef0a0b55
|
2013-10-11 10:36:53 -05:00 |
|
Max Schenkelberg
|
de1a256c47
|
Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104.
Amend: Accepted ticket, cleanup, comments
Change-Id: I78649dd0268b030624888544740a8d7af3e83e97
Former-commit-id: c2471fd381 [formerly b64050ff1e ] [formerly 7a66a3c995 ] [formerly c2471fd381 [formerly b64050ff1e ] [formerly 7a66a3c995 ] [formerly 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]]]
Former-commit-id: 01c0e022d5
Former-commit-id: 98b60f0050 [formerly dfd6ffabd8 ] [formerly d2fa57de0fb4cdcad01f1ef6e1a474065d10bc48 [formerly cf0ad44ee3 ]]
Former-commit-id: 483819660d2cb4b6cc4872b4a95029a3370fc251 [formerly 3c2f370688 ]
Former-commit-id: a9a73d12cb
|
2013-10-11 10:21:37 -05:00 |
|
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 |
|
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 |
|
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 |
|
Steve Harris
|
fc43a80ca0
|
13.5.2-9 baseline
Former-commit-id: 0093ce47a8 [formerly fdbef0e663 ] [formerly a28a2d3041 ] [formerly 0093ce47a8 [formerly fdbef0e663 ] [formerly a28a2d3041 ] [formerly f36cf09d21 [formerly a28a2d3041 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]]
Former-commit-id: f36cf09d21
Former-commit-id: 13873d55c2 [formerly 7d0416293f ] [formerly 9c502fedcbd501781ba7a8be644ea45c55cc5e52 [formerly 45c58e1cb3 ]]
Former-commit-id: 51425d8f2a233b5ad1bc16c34fa214aa28906053 [formerly be3a804cf5 ]
Former-commit-id: 2dc7de0754
|
2013-10-10 10:55:20 -04:00 |
|
Lee Venable
|
ea6c7ba445
|
Issue #2464 - fixed font memory leak.
Former-commit-id: 9c8d1471db [formerly e3f44d751a ] [formerly 1a693c5d35 ] [formerly 9c8d1471db [formerly e3f44d751a ] [formerly 1a693c5d35 ] [formerly e1adc2e4be [formerly 1a693c5d35 [formerly eceb0ab9c7ddc0d28d5452d9bf77888b9e58a9ac]]]]
Former-commit-id: e1adc2e4be
Former-commit-id: 6ac2e88aee [formerly 1b9ed84e9c ] [formerly 5904fc15c7ce1db3e764a1a7c740a0ecbbe10705 [formerly b98e10fe06 ]]
Former-commit-id: e9f3b624851ceaa6ddf6d95220ace13d03f6679c [formerly b4ceef0f22 ]
Former-commit-id: 04c2ea53e9
|
2013-10-10 09:48:55 -05:00 |
|
Slav Korolev
|
b4b4259f48
|
Issue #2427. Fixed memory leak for images
Former-commit-id: 815b2fb40d [formerly 5dcf4a00bc ] [formerly 012497bfef ] [formerly 815b2fb40d [formerly 5dcf4a00bc ] [formerly 012497bfef ] [formerly f0aba7be10 [formerly 012497bfef [formerly 770bfd43e07cd92c2c8a3d7b3d1a07eb6d8b1052]]]]
Former-commit-id: f0aba7be10
Former-commit-id: a1e3716076 [formerly 09f00e1d81 ] [formerly 6d12d9ebc42f69dee6fac7843780d975a33617b7 [formerly 0b08d2bb0e ]]
Former-commit-id: 1892d02d100b6b9cadc7a9f40525dace92cda96b [formerly 001a2d3cfc ]
Former-commit-id: 3271455caf
|
2013-10-10 09:34:24 -04:00 |
|
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 |
|
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 |
|
Richard Peter
|
85ac6ffc2d
|
Merge "Issue #2442 Case creation no longer contains category directory." into omaha_13.5.3
Former-commit-id: 7dfa5a2ea3 [formerly a7a3df7894 ] [formerly 2822583c3d ] [formerly 7dfa5a2ea3 [formerly a7a3df7894 ] [formerly 2822583c3d ] [formerly d409715b41 [formerly 2822583c3d [formerly 68f0f992a67d4fd523cf91b492fd9c2c56573f65]]]]
Former-commit-id: d409715b41
Former-commit-id: 146cbb29fc [formerly 2e4f22c5f0 ] [formerly 29a8e32f9be08d61d7f6f95d67c55d6870c981b0 [formerly c0a36a1f5c ]]
Former-commit-id: fe5ae60ed7650ba9c40a52e63f0fdfebb486fa30 [formerly eefd87ec34 ]
Former-commit-id: 372b951488
|
2013-10-08 14:32:28 -05:00 |
|
Richard Peter
|
3f75f1804e
|
Merge branch 'omaha_13.5.3' (13.5.2-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371
Former-commit-id: 1af5b95d92 [formerly f141fdd5ab ] [formerly 9adbe25ceb ] [formerly 1af5b95d92 [formerly f141fdd5ab ] [formerly 9adbe25ceb ] [formerly b6395cc834 [formerly 9adbe25ceb [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]]
Former-commit-id: b6395cc834
Former-commit-id: 873d2bf184 [formerly 0e7dccd18f ] [formerly 2c457acf95f4418fe275e09d6d24693aa278fc9b [formerly 3abe952ca0 ]]
Former-commit-id: f0f8ac95083f4a299eb6e6aa1073debeb4a2953a [formerly 1895c9f914 ]
Former-commit-id: bc32641181
|
2013-10-08 10:59:50 -05:00 |
|
Roger Ferrel
|
04786dac99
|
Issue #2438 Changes to properly load and save retentions times.
Change-Id: I05a516f1728ad3340547d43da025c6227d7b5551
Former-commit-id: 659313ad31 [formerly a393894c67 ] [formerly d0f7e12518 ] [formerly 659313ad31 [formerly a393894c67 ] [formerly d0f7e12518 ] [formerly 0ee16e8524 [formerly d0f7e12518 [formerly c3a887ca435140ec8cd944da1afa417ad45ea3c6]]]]
Former-commit-id: 0ee16e8524
Former-commit-id: 789357a6d4 [formerly fd96bef170 ] [formerly 655bfac726411200a6012321c5084c55a8d6cb38 [formerly 1ba0b3f411 ]]
Former-commit-id: 7eae0e83b8a985102d905e80b8fe3470f6b3ae5b [formerly 1784d0d0c0 ]
Former-commit-id: 1759da2158
|
2013-10-08 10:48:42 -05:00 |
|
Roger Ferrel
|
e6b195d2cc
|
Issue #2442 Case creation no longer contains category directory.
Change-Id: I1a3e87ed613923f1b1420e347ebf3db31f289bd0
Former-commit-id: 18d4157f3d [formerly 05f6e752f1 ] [formerly e8417dec61 ] [formerly 18d4157f3d [formerly 05f6e752f1 ] [formerly e8417dec61 ] [formerly db49df3fa3 [formerly e8417dec61 [formerly f008a95f617258d429a94d135664e8caf6ba1743]]]]
Former-commit-id: db49df3fa3
Former-commit-id: d4fcf5732c [formerly 5843250e09 ] [formerly d8066daf702a921d6408efe899109455b68dda5b [formerly 6aaf813365 ]]
Former-commit-id: af2843fa830d02f0d625d94172ae10fa869809f8 [formerly 52d4a96b80 ]
Former-commit-id: 02b928ac75
|
2013-10-08 09:47:19 -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 |
|
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 |
|
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 |
|
Ben Steffensmeier
|
99262c2e11
|
Issue #2421 optimize color map loading.
Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304
Former-commit-id: 4e37571a61 [formerly bae5c951d4 ] [formerly f4c616fbff ] [formerly 4e37571a61 [formerly bae5c951d4 ] [formerly f4c616fbff ] [formerly 4e998f2576 [formerly f4c616fbff [formerly ce15657bc794afe819d729121bc202b4f43b97d6]]]]
Former-commit-id: 4e998f2576
Former-commit-id: c476f76088 [formerly 8428550b79 ] [formerly 2ba961c0a05f3ff564c22df12d8a167d66547f34 [formerly 76c73c10af ]]
Former-commit-id: 37c251a27751b0ccd1ed36cf160e1955baa12006 [formerly 1f1f157c17 ]
Former-commit-id: 32cd056472
|
2013-10-07 12:04:19 -05:00 |
|
Bryan Kowal
|
126ba13551
|
Merge "Revert "Issue #2033 - pde and rpm build updates"" into development
Former-commit-id: cfd39d5e5c [formerly 6e05c00981 ] [formerly 0698d28222 ] [formerly cfd39d5e5c [formerly 6e05c00981 ] [formerly 0698d28222 ] [formerly 82d61b53d4 [formerly 0698d28222 [formerly 0fb325bd5a463c243b807fbe44d2499bc7fc814c]]]]
Former-commit-id: 82d61b53d4
Former-commit-id: 4cd2815705 [formerly 5cd20aed43 ] [formerly d267346cd6171a83369a2844a809a17c5af0f381 [formerly 551b501e2e ]]
Former-commit-id: 255d172029359478b94d01e9a1f26bb30c298b2b [formerly d0c79c347c ]
Former-commit-id: ed95cf88b9
|
2013-10-07 11:52:58 -05:00 |
|
Lee Venable
|
5f79b3a696
|
Merge "Issue #2436 - disposed of the sort color" into development
Former-commit-id: 3235852e78 [formerly 0eff818ede ] [formerly c1991c5c66 ] [formerly 3235852e78 [formerly 0eff818ede ] [formerly c1991c5c66 ] [formerly 7bd1fec82e [formerly c1991c5c66 [formerly a087a06f19df47edc2b818d2f68e2eff5aab2b50]]]]
Former-commit-id: 7bd1fec82e
Former-commit-id: 82dc36a619 [formerly a55d310ebe ] [formerly 562ab2641867c75dba6e4590b19f96ce08f546ee [formerly bdd28e1e09 ]]
Former-commit-id: 2597bffd2a0184918fa41234b6c1289430d0e28c [formerly 9d07c6428b ]
Former-commit-id: 7ac56a3b59
|
2013-10-07 09:30:45 -05:00 |
|
Nate Jensen
|
dc284785db
|
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 8ed4f41938 [formerly be1385b705 ] [formerly adc774bee9 ] [formerly c36c50d189 [formerly adc774bee9 [formerly a686d702002a5e01389be1fd5e72558239687080]]]]
Former-commit-id: c36c50d189
Former-commit-id: b91262e079 [formerly 01997dd1fb ] [formerly c894f0c1c606778947fd465b7a239d04dcad6edd [formerly 10ba6f231a ]]
Former-commit-id: fd12eac52dd8e1053b0249ebe69cb1c76c125748 [formerly 315026f786 ]
Former-commit-id: 3d36bc8ee5
|
2013-10-07 09:30:31 -05:00 |
|
Lee Venable
|
c328869516
|
Issue #2436 - disposed of the sort color
Former-commit-id: f27781b74e [formerly 8c8adf8be6 ] [formerly 9c97908f36 ] [formerly f27781b74e [formerly 8c8adf8be6 ] [formerly 9c97908f36 ] [formerly c4ddd46b44 [formerly 9c97908f36 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]]]]
Former-commit-id: c4ddd46b44
Former-commit-id: ccbc44f9d3 [formerly 2ed106cac4 ] [formerly b50a8d2a19218358b07a31a6ee2f605c0ead6152 [formerly 46db8998a6 ]]
Former-commit-id: d130264f10b1958114f77cf64c39663d19c8c154 [formerly 1000147d0c ]
Former-commit-id: b0af7745a6
|
2013-10-07 09:11:25 -05:00 |
|
Dave Hladky
|
89e5b5116c
|
Issue #1797 Separation of gridded time and abstract time object
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63
Former-commit-id: 7d43c5b7f9 [formerly 4d4d93fc0a ] [formerly e0ec10d073 ] [formerly 7d43c5b7f9 [formerly 4d4d93fc0a ] [formerly e0ec10d073 ] [formerly 1733834e74 [formerly e0ec10d073 [formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]]]]
Former-commit-id: 1733834e74
Former-commit-id: 87574fd68a [formerly 21239525ea ] [formerly 965f4a1eb5886ed77447541de327726ef9ab34a7 [formerly 89c341509c ]]
Former-commit-id: b6b1dc8bacb08fc8a37391ca8c9d065363a89f96 [formerly 3ba8fd56f7 ]
Former-commit-id: ab9c5af250
|
2013-10-04 10:36:27 -05:00 |
|
Steve Harris
|
90889f8aa3
|
13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6 ] [formerly 94aa71fcd1 ] [formerly 553238dca4 [formerly 8ba7d392d6 ] [formerly 94aa71fcd1 ] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]]
Former-commit-id: 18325949fb
Former-commit-id: 9e5ad5cd96 [formerly 21b84f0290 ] [formerly 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9 ]]
Former-commit-id: eb4c9e248ff87b2b8f9c421f3a28ac71ab1d6fac [formerly 088eb89ca7 ]
Former-commit-id: e1f7463a41
|
2013-10-04 11:30:03 -04:00 |
|
Bryan Kowal
|
0675463123
|
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 b344543d81 [formerly 33a9270304 ] [formerly 6023c61bca ] [formerly 9a77e3553a [formerly 6023c61bca [formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]]]]].
Former-commit-id: ab100bb5b1 [formerly a75ed2b079 ] [formerly bb2e914c00 ] [formerly ab100bb5b1 [formerly a75ed2b079 ] [formerly bb2e914c00 ] [formerly 9d47e7565d [formerly bb2e914c00 [formerly f735b7bb3a0e23389be086d3582a2e0afdc95515]]]]
Former-commit-id: 9d47e7565d
Former-commit-id: 020566233e [formerly d4eba48f94 ] [formerly 4664dae5d08c4cc7ae160de4020c49d55f3b6503 [formerly 4d08d7a1c3 ]]
Former-commit-id: 68d2284d937f5ab15bf63a3e4489f789f257de56 [formerly 2f6791dc19 ]
Former-commit-id: 07a882ac48
|
2013-10-04 09:47:59 -05:00 |
|
Mike Duff
|
9da45fbeba
|
Issue #2375 - Fix for set number of rows in notification center
Change-Id: I9f8b937265e77c9777313225ab83f71a81b46994
Former-commit-id: 354af07416 [formerly 80081ff25b ] [formerly 865b5f6878 ] [formerly 354af07416 [formerly 80081ff25b ] [formerly 865b5f6878 ] [formerly d258009cc7 [formerly 865b5f6878 [formerly 74327c92303fe846d7333d8760652dbcace2d45f]]]]
Former-commit-id: d258009cc7
Former-commit-id: e1017e7ce8 [formerly 2261f9ff61 ] [formerly 1ac7599652efeecae27c7dd2a2b8782fc610c0bc [formerly 81bd77e56d ]]
Former-commit-id: fe1695af03cdc9d9177a3ce07797224bc9abb217 [formerly 96df3a4989 ]
Former-commit-id: 6a1030a923
|
2013-10-04 09:27:30 -05:00 |
|
Richard Peter
|
9aee14b218
|
Merge "Issue #2390 update grib decoder and vb to handle new storm surge parameters. Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209" into development
Former-commit-id: ae5f215b7e [formerly f52fdf1916 ] [formerly 5adf4298ef ] [formerly ae5f215b7e [formerly f52fdf1916 ] [formerly 5adf4298ef ] [formerly bc3843dc75 [formerly 5adf4298ef [formerly 3d09c6dedbaaa0db6b2247832a45bde8a1357786]]]]
Former-commit-id: bc3843dc75
Former-commit-id: 72a46c6756 [formerly 8694f13766 ] [formerly cd6bc6d12c65aaf24ab02fb94462ec677ce9cce2 [formerly f7a7228e09 ]]
Former-commit-id: 0488b58ee82f69a582d8420f06035cc332282db1 [formerly 2af4638a97 ]
Former-commit-id: 19e860f9a8
|
2013-10-03 16:57:39 -05:00 |
|
Ben Steffensmeier
|
4739ae6645
|
Issue #2390 update grib decoder and vb to handle new storm surge parameters.
Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209
Former-commit-id: 759829c4bb [formerly 7f7aa20d0a ] [formerly 236b3fe05f ] [formerly 759829c4bb [formerly 7f7aa20d0a ] [formerly 236b3fe05f ] [formerly 8f94e1434c [formerly 236b3fe05f [formerly 6de5f10b9abf900fc412f2b1e867ce339a15d41e]]]]
Former-commit-id: 8f94e1434c
Former-commit-id: ecbfb28dd5 [formerly 69eec8d4c6 ] [formerly 58059d168eebf3a630d52b3ac6f4dd734e1de30b [formerly d4670d19b1 ]]
Former-commit-id: b00fe31533b34d7e7bf994f06a803ba4bd872d43 [formerly 9a0a15ffd8 ]
Former-commit-id: 8187fb1fa8
|
2013-10-03 16:30:13 -05:00 |
|
Nate Jensen
|
4368cb1b30
|
Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject
Change-Id: Ic5e4926d97629e9f43990d1585da59eb7ef30650
Former-commit-id: 4347fe1d46 [formerly ee134db130 ] [formerly 3f24b9e424 ] [formerly 4347fe1d46 [formerly ee134db130 ] [formerly 3f24b9e424 ] [formerly 42fee320ab [formerly 3f24b9e424 [formerly e574d96b347d79fe7aaa0f8dded8c93af1191fdd]]]]
Former-commit-id: 42fee320ab
Former-commit-id: 86ddc9d15c [formerly 82e0af6a9c ] [formerly 21bad7f950e722fad0361157366fe92dc449fa51 [formerly 160d1fbb01 ]]
Former-commit-id: 220663087ebab45ada54810410abf530e2c79762 [formerly 25bdea7759 ]
Former-commit-id: 3a28687ca2
|
2013-10-03 15:18:55 -05:00 |
|
Roger Ferrel
|
ae869d0bd8
|
Issue #2326 Added user roles for Archive case and retention.
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967
Former-commit-id: 8ddb8ca55b [formerly c959cedd99 ] [formerly 7f7064d457 ] [formerly 8ddb8ca55b [formerly c959cedd99 ] [formerly 7f7064d457 ] [formerly 42705e4dfa [formerly 7f7064d457 [formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]]]
Former-commit-id: 42705e4dfa
Former-commit-id: 91b64293fe [formerly 220769dab0 ] [formerly 00c2406d52accdc4576d75bc6b343c8f99e96c0a [formerly 4c27adcc53 ]]
Former-commit-id: 73f8bad6e41b1181298090e56e125f8939db1f69 [formerly 029eec5dc4 ]
Former-commit-id: 7bb7770fbf
|
2013-10-03 12:33:26 -05:00 |
|
Max Schenkelberg
|
f6c8e9e3a7
|
Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness
Amend: Accepted ticket.
Change-Id: Ib8171694869f60b46fb38634e71de61eb0e76830
Former-commit-id: fe7051816e [formerly 780ac0129f ] [formerly e3f6b1ea21 ] [formerly fe7051816e [formerly 780ac0129f ] [formerly e3f6b1ea21 ] [formerly 866c851b47 [formerly e3f6b1ea21 [formerly 384b8e6a02d4fffa0688993b2a2b53e974ecf493]]]]
Former-commit-id: 866c851b47
Former-commit-id: 9e14571020 [formerly 43b7cb3107 ] [formerly 00101432c385c23ffd439ab94c020a849e2c2d13 [formerly ba25f56dbe ]]
Former-commit-id: 4b955d0b10fa41cd5cc0265beb057666f0fda43d [formerly 80efdbb2b4 ]
Former-commit-id: 6e5873733e
|
2013-10-03 11:43:26 -05:00 |
|
Ben Steffensmeier
|
01cdfd1a74
|
Issue #2363 Add more vector configuration optons.
Change-Id: I1a3e564629b9e4afe93a0a4ceee8e57681aa0644
Former-commit-id: 1aa1f72b68 [formerly 860258e49c ] [formerly ff06ea1c5a ] [formerly 1aa1f72b68 [formerly 860258e49c ] [formerly ff06ea1c5a ] [formerly 20853f7333 [formerly ff06ea1c5a [formerly 8af298f9ef2c1c03e6be690c07829d0569b1dedd]]]]
Former-commit-id: 20853f7333
Former-commit-id: 075a394152 [formerly bf0642450c ] [formerly d31fc0b096d78305c15905ad2838ab76dd9d9f67 [formerly 6c7c693581 ]]
Former-commit-id: fe305e36f7a480ddb53f09d2c5268ee0ec31211d [formerly baa1ddd596 ]
Former-commit-id: 938ace6bae
|
2013-10-03 10:36:47 -05:00 |
|
Bryan Kowal
|
3b0e12457a
|
Issue #2295 - CAVE updates for ALR
- Amend: relocated qpid connection string comment
- Amend: replaced stacktrace printing with UFStatus
- Amend: removed unused code
- Amend: ThinClientNoficationManagerJob JavaDoc
Change-Id: I091aa29700378149e8eb09dcd11cdfc020e96c76
Former-commit-id: 763aad00be [formerly 4342c463b2 ] [formerly aa8691edfd ] [formerly 763aad00be [formerly 4342c463b2 ] [formerly aa8691edfd ] [formerly 4e4405b0f5 [formerly aa8691edfd [formerly 5a76eabc142619df4c8454c3f2fe93f5283346db]]]]
Former-commit-id: 4e4405b0f5
Former-commit-id: 9d5ae53748 [formerly 6c60d06f9f ] [formerly 9e8c3c5c60478955cb21f639fe96dd7e71b8a6e0 [formerly a727bf3927 ]]
Former-commit-id: 09eb38934521a07d3d49532275423945bfefbb8f [formerly 4ce26acc3b ]
Former-commit-id: 767466a8fe
|
2013-10-02 15:49:17 -05:00 |
|
Ben Steffensmeier
|
5634ecd5bb
|
Issue #2404 move grid reprojection style rules to common.
Former-commit-id: 2117878f10 [formerly a95f0dbac4 ] [formerly a75361ad34 ] [formerly 2117878f10 [formerly a95f0dbac4 ] [formerly a75361ad34 ] [formerly 32a01070f9 [formerly a75361ad34 [formerly 2a81f5fe8e38e6e6c6476586b1df09d8ab01d1fa]]]]
Former-commit-id: 32a01070f9
Former-commit-id: 428afa32f7 [formerly 95b1c01650 ] [formerly f52511bb3d7e8809dd3a38dc82d418a570719e4c [formerly 59d7c79c20 ]]
Former-commit-id: 9fd866488384b8ff82d16fcbe5359ea652d9ee85 [formerly dc4c07c194 ]
Former-commit-id: ff28df9bbc
|
2013-10-02 10:33:23 -05:00 |
|
Roger Ferrel
|
9635ebf647
|
Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859
Former-commit-id: 0c9b15df71 [formerly 2ba7117d13 ] [formerly a76fc08e93 ] [formerly 0c9b15df71 [formerly 2ba7117d13 ] [formerly a76fc08e93 ] [formerly e65b8a9f6e [formerly a76fc08e93 [formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]]]
Former-commit-id: e65b8a9f6e
Former-commit-id: a6316240e5 [formerly 34ea90f18a ] [formerly a2267cf171606a2eb1d0fafc1259f9998139b1a7 [formerly 71737f069d ]]
Former-commit-id: 43c9bb837f60460e0ee95d90741e92a50a1a3384 [formerly 0d86e00182 ]
Former-commit-id: efde4f9297
|
2013-10-01 16:36:34 -05:00 |
|
Nate Jensen
|
43db24a722
|
Merge "Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager" into development
Former-commit-id: e0fb7611a3 [formerly 68c8f9addd ] [formerly 265b6e7e61 ] [formerly e0fb7611a3 [formerly 68c8f9addd ] [formerly 265b6e7e61 ] [formerly 6cd79464ef [formerly 265b6e7e61 [formerly 33899872714e8b945131bc17eab63bc71af38d37]]]]
Former-commit-id: 6cd79464ef
Former-commit-id: cc4b86a7c4 [formerly c4018373f1 ] [formerly 90d47dafdaac70bbece8a61b2bcc06fe50ccdf5e [formerly 64d66cf406 ]]
Former-commit-id: 9be2d046ae3c463c0bd18fb490f51d07cba08c89 [formerly ff27201982 ]
Former-commit-id: 580f3be05d
|
2013-10-01 15:19:56 -05:00 |
|
Richard Peter
|
8a6f8865ea
|
Merge branch 'omaha_13.5.3' (13.5.2-7) into development
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
Change-Id: Ie8cbc10d06805616c05a5d5b52cd725a56f9cf50
Former-commit-id: 21d44cc52a [formerly 75b0f19d87 ] [formerly bb9488bb92 ] [formerly 21d44cc52a [formerly 75b0f19d87 ] [formerly bb9488bb92 ] [formerly f4e71b65d3 [formerly bb9488bb92 [formerly 724a8c87ab8aa880dab45a0a743c3b9d6ace4e2e]]]]
Former-commit-id: f4e71b65d3
Former-commit-id: 1e05051167 [formerly 3514194d3b ] [formerly 7e26aa18c7f56b191ba44b8bf661be4364edc8a9 [formerly 39ae6d437d ]]
Former-commit-id: e746656ef69ab2826357b57acf74fda2ede8ad96 [formerly ddf07f8030 ]
Former-commit-id: 86c28e6e16
|
2013-10-01 15:06:34 -05:00 |
|
Richard Peter
|
ec9e48704b
|
Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml
Former-commit-id: 1eb943d331 [formerly 984785ce5e ] [formerly e45689dbc7 ] [formerly 1eb943d331 [formerly 984785ce5e ] [formerly e45689dbc7 ] [formerly add32a774f [formerly e45689dbc7 [formerly b118718cd8766cf83df1a02079f92636964ca09e]]]]
Former-commit-id: add32a774f
Former-commit-id: 64d062aa4b [formerly aa2eda2c38 ] [formerly 346bf1cefacad9a336319ff9af04ac8832f33e41 [formerly c178e4543a ]]
Former-commit-id: e210fa8935d6faf05e7b000811df47d3a19ffb19 [formerly 06737e3fa2 ]
Former-commit-id: 32dd0fedc1
|
2013-10-01 14:22:33 -05:00 |
|
Nate Jensen
|
f6e4f03765
|
Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager
Change-Id: I83c36ee235066aa57da88f09090470bce84679f7
Former-commit-id: 97c2f14ad4 [formerly f529c077c6 ] [formerly effa4f4f26 ] [formerly 97c2f14ad4 [formerly f529c077c6 ] [formerly effa4f4f26 ] [formerly 3e7dc7782f [formerly effa4f4f26 [formerly f8d8a0033729878c8c6d94c00fd861ddc81f9d96]]]]
Former-commit-id: 3e7dc7782f
Former-commit-id: 1d651281da [formerly e1c35952c9 ] [formerly 9a175ca9dd613a376d9b2a4105b8dc30b47ee828 [formerly 4e6f5afc57 ]]
Former-commit-id: bd7e0e22b92751e13fbae0bd35a8820eae0554e3 [formerly 593700bd28 ]
Former-commit-id: 0c92f4eca1
|
2013-10-01 11:25:45 -05:00 |
|
Lee Venable
|
40dcc74e4b
|
Issue #2420 - fixed font memory leak in the setFont method
Change-Id: Ibf773c6df580cb65dd62b46f8fd127fde6585a57
Former-commit-id: 56ea34b9b3 [formerly e18b0d7e6a ] [formerly 44d9e12d98 ] [formerly 56ea34b9b3 [formerly e18b0d7e6a ] [formerly 44d9e12d98 ] [formerly 9c159e7c40 [formerly 44d9e12d98 [formerly 16effa6f2cda60d566e5f820ab517ed105a0894e]]]]
Former-commit-id: 9c159e7c40
Former-commit-id: ff2735cb20 [formerly e5861dabc3 ] [formerly c2fe41219e1468e63489b59b609a6c88a3e261b0 [formerly 39cf74adf1 ]]
Former-commit-id: cc9f4bc462c6658c6cc6b8999b1d28542a2d7612 [formerly 238d4fa030 ]
Former-commit-id: 027e9179a5
|
2013-09-30 14:31:46 -05:00 |
|
Nate Jensen
|
9be6409ebb
|
Merge "Issue #2400 fix so active map editor is used if applicable" into development
Former-commit-id: 04328937c8 [formerly 1825bea2cb ] [formerly c5d223ade8 ] [formerly 04328937c8 [formerly 1825bea2cb ] [formerly c5d223ade8 ] [formerly 7da1197e7a [formerly c5d223ade8 [formerly 288acb25b23972bda06795bd02e2de973d4b170b]]]]
Former-commit-id: 7da1197e7a
Former-commit-id: a091b5c9fe [formerly 40eb34ac41 ] [formerly 90ff2e938948e00e66ff7ecf8253586ab937eaee [formerly 3e9afe9bab ]]
Former-commit-id: 6a5db254a0efc8dd20c53c7419ecef627e5398eb [formerly 2ce522854c ]
Former-commit-id: 622563303e
|
2013-09-30 13:10:08 -05:00 |
|
Greg Armendariz
|
22751a433b
|
Merge "Issue #2033 - pde and rpm build updates" into development
Former-commit-id: c781e15ae7 [formerly 14fda3ff05 ] [formerly 32349a807b ] [formerly c781e15ae7 [formerly 14fda3ff05 ] [formerly 32349a807b ] [formerly 4c838ad045 [formerly 32349a807b [formerly c39016a5ce3f12e960b2419a8e3a7df6523791a3]]]]
Former-commit-id: 4c838ad045
Former-commit-id: 9816057613 [formerly 660f7bb52f ] [formerly bc3a985a002c87784c0f6a1c6fc438e6f48c05c0 [formerly ab4c07dfdc ]]
Former-commit-id: 4a3b6965bdb130622af0d2fa92aa48cb6fa18387 [formerly 926e15025f ]
Former-commit-id: 03eee46e44
|
2013-09-30 12:11:59 -05:00 |
|
Steve Harris
|
08f26c03de
|
13.5.2-7 baseline
Former-commit-id: cbda847929 [formerly b5cb693619 ] [formerly 0f8fc513bf ] [formerly cbda847929 [formerly b5cb693619 ] [formerly 0f8fc513bf ] [formerly a212c30bd7 [formerly 0f8fc513bf [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]]]
Former-commit-id: a212c30bd7
Former-commit-id: 430d088fae [formerly 06ba0dbf6c ] [formerly 8a4b80da2796beb7c54f486f50af54a82a51b808 [formerly 02d6145782 ]]
Former-commit-id: 2b43017e06d19d174d794056f4c10668bd2a1f3c [formerly 5e4023b974 ]
Former-commit-id: 79d71e33d0
|
2013-09-30 13:05:31 -04:00 |
|
Nate Jensen
|
344dfd805b
|
Issue #2400 fix so active map editor is used if applicable
Change-Id: I642edc1bdc94eac871a07c26e900c2431f567ab1
Former-commit-id: 6f44e0c9e3 [formerly 58c9aced4e ] [formerly 8e9e495149 ] [formerly 6f44e0c9e3 [formerly 58c9aced4e ] [formerly 8e9e495149 ] [formerly c1dd4b40fb [formerly 8e9e495149 [formerly 563212924964f8ca66cba789d7867b19c68d0682]]]]
Former-commit-id: c1dd4b40fb
Former-commit-id: 3a4fc09777 [formerly 81f5ecb21a ] [formerly 876c39cce804bd2eaf674c9c20e970b9219de559 [formerly 136ea71235 ]]
Former-commit-id: 8f67c9aecbad713073c6c28ec81520dae762c7f9 [formerly 726f38c27f ]
Former-commit-id: 8b62ea092a
|
2013-09-30 11:47:26 -05:00 |
|