Richard Peter
|
db521b7fff
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
rpms/awips2.cave/Installer.cave-feature/component.spec
Former-commit-id: ca61898cb4 [formerly 62b322c18d] [formerly 1a664aed21] [formerly ca61898cb4 [formerly 62b322c18d] [formerly 1a664aed21] [formerly c0643db0ba [formerly 1a664aed21 [formerly fee86c220c12c09c714245fa8666bc08f4f9775b]]]]
Former-commit-id: c0643db0ba
Former-commit-id: 57c11e762e [formerly 1c74c3cbde] [formerly 015b66f07af3e9d194a45a1c6b1ca9257fb5ff94 [formerly ecba2f7317]]
Former-commit-id: a98f9803d8b17634f3ea5bdd6a61850aaef01d2a [formerly 93c2c93969]
Former-commit-id: bb0bd3fe2c
|
2013-10-09 13:14:06 -05:00 |
|
Nate Jensen
|
991f4cf832
|
Merge "Issue #2402 Make PythonDecoder more extendable." into development
Former-commit-id: ad19fcbd3c [formerly e0cbf2e05f] [formerly 7cecf177fe] [formerly ad19fcbd3c [formerly e0cbf2e05f] [formerly 7cecf177fe] [formerly 2d25d9e46a [formerly 7cecf177fe [formerly 3daa3f8284a5a65657429503c055ab34c1ebfb48]]]]
Former-commit-id: 2d25d9e46a
Former-commit-id: 941a19ec45 [formerly c026672fe1] [formerly 8141501f8e4bab22b63e925b68fc97ace6d52f88 [formerly 9ca9bd05a0]]
Former-commit-id: cc663756e83249c64df8e4c326256f3fc12be057 [formerly 75f9f891a7]
Former-commit-id: 4988c3b715
|
2013-10-08 16:20:43 -05:00 |
|
Bryan Kowal
|
8da1b95cc4
|
Merge "Issue #2033 - windows build updates for etc directory deployment" into development
Former-commit-id: 6b2a1c0c05 [formerly 00f1a83966] [formerly f6e6932434] [formerly 6b2a1c0c05 [formerly 00f1a83966] [formerly f6e6932434] [formerly 7ddd665597 [formerly f6e6932434 [formerly 3a1e9baf2c593ee99f9b0299debceafab653fc46]]]]
Former-commit-id: 7ddd665597
Former-commit-id: 315f1cf666 [formerly 5e114e4f5d] [formerly 92694a2e2db20b452689b28972a258ded040e5cc [formerly 6a33ba460f]]
Former-commit-id: 9b69d11012d0a637fe88ab126bb13f6b2712b4d6 [formerly 78e7109310]
Former-commit-id: d10a370207
|
2013-10-08 15:38:20 -05:00 |
|
Bryan Kowal
|
d6d7b8d2ac
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: ab10c1dd5b [formerly bb5ef114d1] [formerly aa4ea792c1] [formerly ab10c1dd5b [formerly bb5ef114d1] [formerly aa4ea792c1] [formerly 542f5f2349 [formerly aa4ea792c1 [formerly 606030384b5fe1eb9411d4b35d3282b15b1398b4]]]]
Former-commit-id: 542f5f2349
Former-commit-id: 3534686eb5 [formerly de61382dc7] [formerly 518cc2598c60d171ae83c427ee2062c4d7ef8025 [formerly 5d5ccb7599]]
Former-commit-id: 0c291efdbf84e5f8baf1abb4fbbc4e083a99112e [formerly 86f7af5968]
Former-commit-id: 93dbbc2321
|
2013-10-08 14:44:38 -05:00 |
|
Richard Peter
|
3f75f1804e
|
Merge branch 'omaha_13.5.3' (13.5.2-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371
Former-commit-id: 1af5b95d92 [formerly f141fdd5ab] [formerly 9adbe25ceb] [formerly 1af5b95d92 [formerly f141fdd5ab] [formerly 9adbe25ceb] [formerly b6395cc834 [formerly 9adbe25ceb [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]]
Former-commit-id: b6395cc834
Former-commit-id: 873d2bf184 [formerly 0e7dccd18f] [formerly 2c457acf95f4418fe275e09d6d24693aa278fc9b [formerly 3abe952ca0]]
Former-commit-id: f0f8ac95083f4a299eb6e6aa1073debeb4a2953a [formerly 1895c9f914]
Former-commit-id: bc32641181
|
2013-10-08 10:59:50 -05:00 |
|
Richard Peter
|
c1adafc8f6
|
Merge "Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects" into development
Former-commit-id: 8d685ae419 [formerly f7ae6aae92] [formerly 28760a1273] [formerly 8d685ae419 [formerly f7ae6aae92] [formerly 28760a1273] [formerly 7a4ed8bea4 [formerly 28760a1273 [formerly fd76d3a72bd18a2afdce5855173a5a9b9ad9e00b]]]]
Former-commit-id: 7a4ed8bea4
Former-commit-id: 605a825c3a [formerly f28a0c025e] [formerly a6096c75637f44fedac9a8bfb4d95837328c1a2e [formerly 0b1f6e2c9b]]
Former-commit-id: d7c1580505db4e2fd0a5c3c0b905e08577fed539 [formerly 9abed1e51e]
Former-commit-id: b2b7521cab
|
2013-10-08 10:50:59 -05:00 |
|
Bryan Kowal
|
537228e934
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: 80c2ccd547 [formerly 96c800f3f4] [formerly 5eba3290c8] [formerly 80c2ccd547 [formerly 96c800f3f4] [formerly 5eba3290c8] [formerly 8f14318bc7 [formerly 5eba3290c8 [formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]]]
Former-commit-id: 8f14318bc7
Former-commit-id: ef0e6ede56 [formerly 72ed6c5f7a] [formerly d3917f8d40a980b637b27fc44df2b93eff0d5796 [formerly 53af4c7284]]
Former-commit-id: 7f36b6b414d057a6775afb670b148d983edab252 [formerly 5477a06781]
Former-commit-id: b8c2ece19c
|
2013-10-08 10:35:03 -05:00 |
|
Lee Venable
|
513370deee
|
Merge "Issue #2443 - fixed image memory leak." into development
Former-commit-id: 43acce4d38 [formerly 766190493e] [formerly 18845668a6] [formerly 43acce4d38 [formerly 766190493e] [formerly 18845668a6] [formerly ea27ffd4a3 [formerly 18845668a6 [formerly 1ef7b46cb407dfebbf010a4b59bea8d8ef3eb595]]]]
Former-commit-id: ea27ffd4a3
Former-commit-id: d7cd7740ba [formerly ec38285d85] [formerly 25632dc0eed72cff650c2d3f677914eab9537e20 [formerly 664971b75b]]
Former-commit-id: a2c78e01e5fec01cb6f6a2aa28431c777e8a3aeb [formerly c775ac006f]
Former-commit-id: 7d3285a04a
|
2013-10-08 10:33:03 -05:00 |
|
Dave Hladky
|
e103fa9c58
|
Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects
Former-commit-id: 521cb3a61d [formerly 4867082be1] [formerly fbe4078bc5] [formerly 521cb3a61d [formerly 4867082be1] [formerly fbe4078bc5] [formerly ad1bb73c70 [formerly fbe4078bc5 [formerly c299ed7a5bb02980ecb30b0ab38752d2878d50a7]]]]
Former-commit-id: ad1bb73c70
Former-commit-id: 62c7b8a83b [formerly 445d836fe6] [formerly 91f21451dc2485422212959320afb62a1b8190e7 [formerly 093b41499b]]
Former-commit-id: ad72de9511e44f91521120647a5a70b0caacc31f [formerly 7807722694]
Former-commit-id: de24cf3b9a
|
2013-10-08 10:25:36 -05:00 |
|
Bryan Kowal
|
fe3d00d668
|
Issue #2422 - fix edexBridge merge into RHEL6 14.2.1
Former-commit-id: 905f8941ed [formerly 7f32bcbab3] [formerly 394141bdff] [formerly 905f8941ed [formerly 7f32bcbab3] [formerly 394141bdff] [formerly cd586bb8cb [formerly 394141bdff [formerly d8116ef62c738e3a46fe6fd08b89a90c3896507a]]]]
Former-commit-id: cd586bb8cb
Former-commit-id: 07fd4f3652 [formerly 9cabdde9eb] [formerly 61285bd0aa0abcba1cc58dfb3834df7fed108388 [formerly fa01165c59]]
Former-commit-id: ae51362c9f225f854b486fe86160dfd5c566a77e [formerly 3229dd4542]
Former-commit-id: dde85b814b
|
2013-10-08 10:24:32 -05:00 |
|
Richard Peter
|
3f32cc7a8b
|
Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
Former-commit-id: f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 31c87ab01e [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]]
Former-commit-id: d9eae3ea28
Former-commit-id: af9c4be87a [formerly 94d0913bd9] [formerly ff84474d44083bc5676fa6731229af076e27cb80 [formerly f4b47dda50]]
Former-commit-id: 4e8e2fc0d4cdef4da801ac692b1793e0b0aadafc [formerly 33b4f0c247]
Former-commit-id: d321c61259
|
2013-10-08 09:45:27 -05:00 |
|
Lee Venable
|
cdba1e48df
|
Issue #2443 - fixed image memory leak.
Former-commit-id: 7dae2b36cf [formerly 1021c25d9d] [formerly 0bacce33bc] [formerly 7dae2b36cf [formerly 1021c25d9d] [formerly 0bacce33bc] [formerly 47f8200757 [formerly 0bacce33bc [formerly fccb24f5834dd746f6868b4390e3c17dd12dc729]]]]
Former-commit-id: 47f8200757
Former-commit-id: fc98572a27 [formerly 03c4e9a287] [formerly 43dc0958942086502dfa768b01124fa7746d0abb [formerly cd63ee8644]]
Former-commit-id: ba282d5c92d098a16eba78a72542a536bd52ee6b [formerly 162df3c8d2]
Former-commit-id: e2b44eac03
|
2013-10-08 09:39:00 -05:00 |
|
Max Schenkelberg
|
6afd29dae3
|
Issue #2081 Created custom dataURI field converter interface for use with DataTime so toString can be left unchanged (with spaces) and dataTimes in the dataURI will also be left unchanged (with underscores). Refactored DataURIUtil to support these new field converters.
Change-Id: I0a3983b04a475f6fcf5f70ee89cecf6dd2e67676
Former-commit-id: 86f38edeac [formerly 0e1a4fdf96] [formerly 1bc2e9aa2b] [formerly 86f38edeac [formerly 0e1a4fdf96] [formerly 1bc2e9aa2b] [formerly 782ec43213 [formerly 1bc2e9aa2b [formerly 86788ab1704c381fc2d26b1891e37aed7367fd3d]]]]
Former-commit-id: 782ec43213
Former-commit-id: 8d83725f8b [formerly 347fd2bfe0] [formerly 3da149ba88c46d6af3cc067262f89258c997b007 [formerly d1e5c9d9e2]]
Former-commit-id: b175428aba00ad616d0c62201fbb2967dbcec0ac [formerly 1cc4b105e9]
Former-commit-id: 8727dcb949
|
2013-10-08 09:34:08 -05:00 |
|
Bryan Kowal
|
6838bff38e
|
Issue #2033 - windows build updates for etc directory deployment
Change-Id: Icfb30220639eeefe01a03479f0a5248dcb5cf928
Former-commit-id: c7ea9ddac2 [formerly 89c561ad89] [formerly c5f6540e3c] [formerly c7ea9ddac2 [formerly 89c561ad89] [formerly c5f6540e3c] [formerly 073fd49741 [formerly c5f6540e3c [formerly d51012b2e5685e547d0d8f3b3ccd0f4c4640b9dc]]]]
Former-commit-id: 073fd49741
Former-commit-id: cc0ed5ee96 [formerly 42ac7b6bdd] [formerly 03fce35c4a56e480e55739c7f4bfb5c42b76f678 [formerly e3ad305202]]
Former-commit-id: d34c434b98be92df3170f3a3e4e3928556e2e1b2 [formerly cef35754ca]
Former-commit-id: 9d045d3c92
|
2013-10-07 18:41:49 -05:00 |
|
Brad Gonzales
|
0c28bac66b
|
Issue #2267 Shared Subscription fixes. DataDelivery Port environment standardization. Logging updates.
Amend: Refactored WMO header applier.
Fixes for WMO header applier.
Updated dataDeliveryRetrieval.xml with correct wmo header pattern.
Removed manual ingest from registry mode.
Simplified data delivery distribution matching pattern.
Added serialize test for wfs response.
Updated comments.
Moved WfsRetrievalResponse to com.raytheon.uf.edex.datadelivery.retrieval package.
Added WfsRetrievalResponse to Jaxb unmarshalable classes in DeserializeRetrievedDataFromIngest.
HibernateBandwidthInitializer.executeAfterRegistryInit(), in NCF mode schedules shared subs.
Change-Id: I0278339701f5f55491120c35d80cbd6d3dcc84f7
Former-commit-id: 08817277b4 [formerly dc45b582e1] [formerly 21acb75f24] [formerly 08817277b4 [formerly dc45b582e1] [formerly 21acb75f24] [formerly a6540d69ea [formerly 21acb75f24 [formerly 8bf8efa14520aaba532ca7a2e82e4c1fa24adca8]]]]
Former-commit-id: a6540d69ea
Former-commit-id: cb185b2395 [formerly e129c33bee] [formerly 66f28211c1048177be60ab32e1b6360946fea466 [formerly 9d981ab2f3]]
Former-commit-id: 47936db769a40ca23057acc514918317e8c3fd70 [formerly 0f3b5172d4]
Former-commit-id: 0313e9c835
|
2013-10-07 17:06:38 -05:00 |
|
Richard Peter
|
56e8a04739
|
Merge "Issue #2385 Fixed subscription backup web page" into development
Former-commit-id: a5df53787e [formerly 540d0e7b9c] [formerly 9e17d68bd1] [formerly a5df53787e [formerly 540d0e7b9c] [formerly 9e17d68bd1] [formerly 472b3b10a3 [formerly 9e17d68bd1 [formerly 73b5da79892dd0781638329e4dd7be56a11e642d]]]]
Former-commit-id: 472b3b10a3
Former-commit-id: 1be34a6708 [formerly 0306778ac2] [formerly 3f1f17b8b8f7c9e5603efd120ec81f4b642d6876 [formerly eb5b61ba85]]
Former-commit-id: dd1b63cdd7cee780019dc244e6a0393018f8ff60 [formerly a02af3bc08]
Former-commit-id: cf210025ae
|
2013-10-07 16:21:46 -05:00 |
|
Richard Peter
|
9afa320d3b
|
Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development
Former-commit-id: 8d8d1f4996 [formerly 9d424c212b] [formerly 2e062048e1] [formerly 8d8d1f4996 [formerly 9d424c212b] [formerly 2e062048e1] [formerly e2c7bb21d7 [formerly 2e062048e1 [formerly 204c2034a08cd69fc7286639f37e5ff936ecf49e]]]]
Former-commit-id: e2c7bb21d7
Former-commit-id: 55c9d3f470 [formerly 80dd506d10] [formerly 3a79334f10bfa880b8282cf69118ab055077d496 [formerly e43cd4b397]]
Former-commit-id: 2a096cf0447100b6a3d5f28db7d1dd0106f8384c [formerly 7ef56bfc43]
Former-commit-id: 54dc5aa82c
|
2013-10-07 16:19:11 -05:00 |
|
Greg Armendariz
|
ffb694a4b9
|
Merge "Issue #2033 - deploy the CAVE localization to the etc directory at installation time" into development
Former-commit-id: 46e40d4816 [formerly 13fe6c9677] [formerly b11cc68fb9] [formerly 46e40d4816 [formerly 13fe6c9677] [formerly b11cc68fb9] [formerly 0fe6f6c591 [formerly b11cc68fb9 [formerly 194bf8383e6b01f689500212413994c67449d1b7]]]]
Former-commit-id: 0fe6f6c591
Former-commit-id: c739504d85 [formerly a4af4a4856] [formerly 9419cce994fbb5fb682ebd497cc7b76d2171f780 [formerly 2c93afc923]]
Former-commit-id: c387ffa8f42e87f7d9b49c0353ab0f9ee5923074 [formerly cf86299e1c]
Former-commit-id: 08f4f74ad3
|
2013-10-07 14:50:02 -05:00 |
|
Nate Jensen
|
7d65d086ff
|
Issue #2361 remove ncep met parameter classes from ISerializableObject file since they're not being transformed to/from XML
Change-Id: I3f27652ff84147dc2b9ce35112dad2434ce227e1
Former-commit-id: d54a78a7fc [formerly dc909c42ee] [formerly b2f0d58379] [formerly d54a78a7fc [formerly dc909c42ee] [formerly b2f0d58379] [formerly 2fc0ea395c [formerly b2f0d58379 [formerly bfce20fe8a481e6a9767803cf24da42ac48ae051]]]]
Former-commit-id: 2fc0ea395c
Former-commit-id: b86ea30ec9 [formerly d1e416ea39] [formerly 2bf05a30475416a1fd2ec531963eaf137f43c1e0 [formerly 6ec616401a]]
Former-commit-id: 1aa2d9af53a629d34796d48ac8b9b2da5ed9d024 [formerly 913cd8d0d1]
Former-commit-id: 83f9e66092
|
2013-10-07 14:30:19 -05:00 |
|
Nate Jensen
|
a87c26d729
|
Merge "Issue #2361 remove XML annotations from IHFS table classes" into development
Former-commit-id: 7c9622f3b5 [formerly 96687f720f] [formerly be30e6da89] [formerly 7c9622f3b5 [formerly 96687f720f] [formerly be30e6da89] [formerly 5b0e80322a [formerly be30e6da89 [formerly b33d425446cac196dd7530d250790c3361762740]]]]
Former-commit-id: 5b0e80322a
Former-commit-id: e9ffe59bc6 [formerly af56367b95] [formerly cda6eff5c9fbc185dcf5b2b57eba6ee9353398bf [formerly 571c69f4a0]]
Former-commit-id: d83d32588dd9fe4166aa40acc622a8ce619377e2 [formerly 92f3b9cfa9]
Former-commit-id: 2096477ed6
|
2013-10-07 14:21:40 -05:00 |
|
Lee Venable
|
b6fff4e6e2
|
Merge "Issue #2437 - fixed color memory leak." into development
Former-commit-id: 7321f4e61f [formerly 3bfe4bf45c] [formerly 5081bbd0ab] [formerly 7321f4e61f [formerly 3bfe4bf45c] [formerly 5081bbd0ab] [formerly b1d02c6a49 [formerly 5081bbd0ab [formerly b7691a4e940cc3461a39cce871c6de15110bf1d1]]]]
Former-commit-id: b1d02c6a49
Former-commit-id: ca281660c6 [formerly ee63fc9004] [formerly e2df9e89f7153660d6c4bffe212ef2cb3e805d3e [formerly 4060fa7e0b]]
Former-commit-id: af0c173990abaff7d9fea09cc035f1eaafcda70b [formerly 13a8614130]
Former-commit-id: db4f3fd35a
|
2013-10-07 14:13:56 -05:00 |
|
Lee Venable
|
60fc2554e9
|
Merge "Issue #2421 optimize color map loading. Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304" into development
Former-commit-id: ccb9b15f8c [formerly f94bcf4776] [formerly eeee5c7948] [formerly ccb9b15f8c [formerly f94bcf4776] [formerly eeee5c7948] [formerly c01eb85e53 [formerly eeee5c7948 [formerly 7139b6fe32b6de8c87c96e3b55d6ad83f11b149a]]]]
Former-commit-id: c01eb85e53
Former-commit-id: 54975835b5 [formerly 18bbfeb4cb] [formerly 44f2874ed6741bb80dbe72b605f855a78f686c71 [formerly 72a6650958]]
Former-commit-id: 16d3cd33db591cd73e2703d41edeab7fa50c3643 [formerly f34b07d207]
Former-commit-id: 61201849dd
|
2013-10-07 13:56:50 -05:00 |
|
Lee Venable
|
e4a7b72c9e
|
Issue #2437 - fixed color memory leak.
Former-commit-id: 4f5ee0dbcd [formerly 615fcc7f8e] [formerly 604f8f86a4] [formerly 4f5ee0dbcd [formerly 615fcc7f8e] [formerly 604f8f86a4] [formerly a4be7633a6 [formerly 604f8f86a4 [formerly f081bea82ced5931f8424d51994571d5a9971cfe]]]]
Former-commit-id: a4be7633a6
Former-commit-id: 9502d31555 [formerly 046a0a764d] [formerly e3d05cf966b9b910eaf401e19cf70c624f4713f0 [formerly b3efbb97c1]]
Former-commit-id: 7e2f5ee8acd402f4b53f733aef6203fa20af913f [formerly 27a4e1ef75]
Former-commit-id: d07fc36b0c
|
2013-10-07 13:55:54 -05:00 |
|
Nate Jensen
|
48115ef8ae
|
Issue #2361 remove XML annotations from IHFS table classes
Change-Id: I10c3fb7aeec4ec96a17d54ee388c4b0770e9e939
Former-commit-id: 64a5f390c8 [formerly f2dd7d28e1] [formerly 55a39d6458] [formerly 64a5f390c8 [formerly f2dd7d28e1] [formerly 55a39d6458] [formerly ded2e8a852 [formerly 55a39d6458 [formerly 137b91fdad93d661243ecfbb60e28dc0c77b5b76]]]]
Former-commit-id: ded2e8a852
Former-commit-id: 8358e38636 [formerly e40465105c] [formerly c859edc26db34632f9698fc027f825d83211ccd0 [formerly 1d3b896c05]]
Former-commit-id: 092a3fef5b9be8e85d4f9c722430314c58821cb1 [formerly e267e0336b]
Former-commit-id: e86afaee6d
|
2013-10-07 13:06:05 -05:00 |
|
Richard Peter
|
20f1569e97
|
Issue #2357: Remove edex jms resource reuse by other threads.
Change-Id: I73f5a01f2d943bb9f7f4e51028cc16bfcee3d823
Former-commit-id: d68188c3c2 [formerly c146f90a09] [formerly be99174b65] [formerly d68188c3c2 [formerly c146f90a09] [formerly be99174b65] [formerly 802ab87e57 [formerly be99174b65 [formerly a13a027b07a8d080c4506748afe5882575ae6532]]]]
Former-commit-id: 802ab87e57
Former-commit-id: 681f174d88 [formerly 7dc61aceee] [formerly a391c7d1d91621bfca9c5deeb80e3d2239e0295a [formerly 5320536f54]]
Former-commit-id: 0af0b7c04dbb08e74aefe806a6e6a398a4a099fa [formerly 91bf400b6a]
Former-commit-id: 74b976232c
|
2013-10-07 12:38:08 -05:00 |
|
Bryan Kowal
|
74607bfac3
|
Issue #2033 - deploy the CAVE localization to the etc directory at installation time
Change-Id: I899b89c12d2bbe2fb739ba15b3bafbc9855e6102
Former-commit-id: b64ff3e5b0 [formerly 5f72ab9b4e] [formerly 73ccd8245d] [formerly b64ff3e5b0 [formerly 5f72ab9b4e] [formerly 73ccd8245d] [formerly c3a65f9882 [formerly 73ccd8245d [formerly 40d1633bb60c1d9aefcc79022158a66b50cca054]]]]
Former-commit-id: c3a65f9882
Former-commit-id: 6d41496563 [formerly 0f9d525ac1] [formerly 6318bd34a70adec7bacce93dbc889b1c6350df7e [formerly e27bfa7c27]]
Former-commit-id: 9b503867b3bc3cb0c68df17ca895e1a78b627a49 [formerly 2f2c57b448]
Former-commit-id: f7c5884c21
|
2013-10-07 12:22:50 -05:00 |
|
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 |
|
Greg Armendariz
|
8611709e74
|
Merge "Revert "Issue #2033 - msi build updates"" into development
Former-commit-id: cc3666ae99 [formerly 9a75ba8d59] [formerly 2059cbc573] [formerly cc3666ae99 [formerly 9a75ba8d59] [formerly 2059cbc573] [formerly b09988c403 [formerly 2059cbc573 [formerly 7157d5791045a456ebe9eef1c8ce21e549bf0761]]]]
Former-commit-id: b09988c403
Former-commit-id: 70af0399d8 [formerly f03c56aa9d] [formerly e195dddece73fe0b7dd5eecb629b639407bd6bd7 [formerly 74b1f23db7]]
Former-commit-id: 807f6be1928daf180e58f12cfa12d71c9443694a [formerly 25e168e8a2]
Former-commit-id: 249ea872cc
|
2013-10-07 10:01:14 -05:00 |
|
Benjamin Phillippe
|
c0947639c2
|
Issue #2385 Fixed subscription backup web page
Change-Id: I06905712f279f487ac8298ab40ca22a012d01dbf
Former-commit-id: 1a10852cbf [formerly ce3e85e4d4] [formerly 2759456eb4] [formerly 1a10852cbf [formerly ce3e85e4d4] [formerly 2759456eb4] [formerly 5e72b8fa2e [formerly 2759456eb4 [formerly 8a0e996d66b57d071870b907bcf224310d4b10c8]]]]
Former-commit-id: 5e72b8fa2e
Former-commit-id: 1d645a975b [formerly 4fef3dad20] [formerly d30302cf9dd37231ec21ef2abe22da13e1537916 [formerly 323d9f40da]]
Former-commit-id: 5487bc58007722ca37c4746a603b25179f82ee6a [formerly b25530ea61]
Former-commit-id: dc4b2c7ac3
|
2013-10-07 09:52:47 -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 |
|
Bryan Kowal
|
b767da74f2
|
Revert "Issue #2033 - msi build updates"
Undo copying localization into etc at build time.
This reverts commit d35b6790d013a8eddd10469d301e11e853d2875f [formerly e46254cef1] [formerly 50d9790e17 [formerly 3bf9b72f52] [formerly 7208eadbfb] [formerly 50d9790e17 [formerly 3bf9b72f52] [formerly 7208eadbfb] [formerly e46254cef1 [formerly 7208eadbfb [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]]].
Former-commit-id: 28e14d1520 [formerly 1632c72103] [formerly 02e1055f19] [formerly 28e14d1520 [formerly 1632c72103] [formerly 02e1055f19] [formerly 3d6ff3f0fa [formerly 02e1055f19 [formerly f705e71d62e84d82cb8e880e0b17e18710f61d97]]]]
Former-commit-id: 3d6ff3f0fa
Former-commit-id: 1b450afc35 [formerly a29a8b8d0e] [formerly cf942de33b8e2634ee81bb98c9f6b239e1f435b7 [formerly ac0b2bd9eb]]
Former-commit-id: 2829b85519ed488a07adf58fb2aa8d2956d7f337 [formerly b72e77fdc0]
Former-commit-id: 0ad325f534
|
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 |
|
Ben Steffensmeier
|
f06e6116c3
|
Issue #2402 Make PythonDecoder more extendable.
Former-commit-id: 69cab5e25f [formerly f848fa2218] [formerly a5a0bf72b6] [formerly 69cab5e25f [formerly f848fa2218] [formerly a5a0bf72b6] [formerly 058b32eaec [formerly a5a0bf72b6 [formerly 19329b4f5a621f20bc45beedbe5acaadc84e9c2f]]]]
Former-commit-id: 058b32eaec
Former-commit-id: 7f079e75a7 [formerly d0c330f5a2] [formerly 06c3f35b16a3936f0a83c95eff7c53e69cfe49f3 [formerly 2bccf6a62d]]
Former-commit-id: 3d0fd46d669925f46415fcd1bd45ea0bb0b67fab [formerly dcc0043064]
Former-commit-id: edeb2950ad
|
2013-10-03 18:19:04 -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 |
|
Steve Harris
|
91a0ae5f6d
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/awips2.core/Installer.java/1.6/component.spec
Former-commit-id: 1afefb5f6f [formerly 96f30b4793] [formerly 8622cc6efa] [formerly 1afefb5f6f [formerly 96f30b4793] [formerly 8622cc6efa] [formerly df206f83bb [formerly 8622cc6efa [formerly d1246136b73673acd22df53fee02adbd51022b4b]]]]
Former-commit-id: df206f83bb
Former-commit-id: d7cd8984aa [formerly 00cc9bc926] [formerly c0033d06ec93f101a6cee850c2f667d20f652759 [formerly 05ac206277]]
Former-commit-id: fe1cc7d1c0c024538e7a6418610255a065df51cb [formerly b225dffea0]
Former-commit-id: a9d0caa9d7
|
2013-10-03 16:04:21 -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 |
|
Nate Jensen
|
605883d367
|
Merge "Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness" into development
Former-commit-id: 4308271540 [formerly 4fa6911aa0] [formerly 23c742c202] [formerly 4308271540 [formerly 4fa6911aa0] [formerly 23c742c202] [formerly 36f5c2c44b [formerly 23c742c202 [formerly fdf53f7eb888c38849821457fe248ba1f399b6e5]]]]
Former-commit-id: 36f5c2c44b
Former-commit-id: 15fcc9f06f [formerly 649c3b0e7d] [formerly 08a7b33298fc1dc66e7d0ed824ae2a26fc0bbbc1 [formerly 485a36fbb4]]
Former-commit-id: a729071b455eafbe2ee24dea385d54a617153dae [formerly 084a495032]
Former-commit-id: 96672be561
|
2013-10-03 12:56:47 -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 |
|
Bryan Kowal
|
58c68ad717
|
Issue #2423 - Java 7 Revision 40 for Linux
Former-commit-id: aca0ce04b8 [formerly ef93741056] [formerly 3b1f089cbd] [formerly aca0ce04b8 [formerly ef93741056] [formerly 3b1f089cbd] [formerly 26f787ac83 [formerly 3b1f089cbd [formerly 665399b4e10d7d001edc2533b29324da48b78aa9]]]]
Former-commit-id: 26f787ac83
Former-commit-id: 42298eb650 [formerly 2e9836e506] [formerly 9ca71543985cf366b72245955e1fe6c6e51848a9 [formerly 429c534da0]]
Former-commit-id: 711ed72151263981fca589f1d61416eda2f74eea [formerly 9f7222a1b3]
Former-commit-id: 16efd625bb
|
2013-10-03 11:54:23 -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
|
ea88581637
|
Issue #2432 - fix qpid build
Former-commit-id: 20cf44791d [formerly fdf31a8a6e] [formerly 5db663c2ae] [formerly 20cf44791d [formerly fdf31a8a6e] [formerly 5db663c2ae] [formerly 6736231873 [formerly 5db663c2ae [formerly ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b]]]]
Former-commit-id: 6736231873
Former-commit-id: 51cf9ed479 [formerly bd93d164c7] [formerly f0d8690b42b34a08e3cc25f03f917bd6fd863575 [formerly f100a9c96a]]
Former-commit-id: 27430e9ec9200cfdcd7eee31ec3a7954ca40324c [formerly 751cd48248]
Former-commit-id: e874f182ef
|
2013-10-03 08:33:15 -05:00 |
|
Bryan Kowal
|
ef1e7311a0
|
Issue #2422 - fix 14.2.1 RHEL6 build
Former-commit-id: f092ee3d76 [formerly efd377f12f] [formerly 61527c0b80] [formerly f092ee3d76 [formerly efd377f12f] [formerly 61527c0b80] [formerly 87087a5ea4 [formerly 61527c0b80 [formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]]]]
Former-commit-id: 87087a5ea4
Former-commit-id: c5df92f4eb [formerly af4b729522] [formerly b91956819bff7666a317ceb10eb717ae268cbcff [formerly fe4e9ca3f8]]
Former-commit-id: 67768811b42e628c1bd76006584ee4a3345d538e [formerly 297ee050ca]
Former-commit-id: a249b45111
|
2013-10-02 18:41:11 -05:00 |
|