Commit graph

179 commits

Author SHA1 Message Date
Steve Harris
071a47944f Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 67ab6c135e [formerly 5aac54b9f9] [formerly 0ab03f2796] [formerly 67ab6c135e [formerly 5aac54b9f9] [formerly 0ab03f2796] [formerly 83d2194a5a [formerly 0ab03f2796 [formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]]]]
Former-commit-id: 83d2194a5a
Former-commit-id: eff76c3566 [formerly 771be074c0] [formerly f7cdd9e73c5d19a1d50e670a5eeceaa5bc626e90 [formerly 0efff318b8]]
Former-commit-id: a4fea6a1d532840bbb0cc77ad3e807e6be10e9b3 [formerly f5fc091e48]
Former-commit-id: 6da47cfbdd
2013-10-30 12:36:53 -05:00
Steve Harris
e979d6caa1 13.5.3-2 baseline
Former-commit-id: 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 6d85d944a6 [formerly 055783655b [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]]
Former-commit-id: 6d85d944a6
Former-commit-id: fef629ce26 [formerly 0c17777164] [formerly 08cfc6740d0a1f987b0743cf3f07ab435cbb6ddc [formerly aef0e828d2]]
Former-commit-id: 33aa78b83a8657172de9ca0d0ef491a27006efe6 [formerly 1cc13c9992]
Former-commit-id: e90722d781
2013-10-30 12:53:25 -04:00
Steve Harris
179be1638a Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly 972339d60f [formerly 602f138493 [formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]]]
Former-commit-id: 972339d60f
Former-commit-id: dd533f0bce [formerly a444c93ee7] [formerly 9a8e1c383979dad1eabd28f3f1501bac50b45b28 [formerly 4c0599bae8]]
Former-commit-id: 9ec4de5036bebda97665c7c5c43fd0794ee9593d [formerly 0bf9020c49]
Former-commit-id: f49a22bae2
2013-10-28 14:39:22 -05:00
Steve Harris
6b1df92d87 14.1.1-5 baseline
Former-commit-id: 31eefc21cd [formerly 933e7395ac] [formerly 877776a04c] [formerly 31eefc21cd [formerly 933e7395ac] [formerly 877776a04c] [formerly f4c53b02fa [formerly 877776a04c [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]]]
Former-commit-id: f4c53b02fa
Former-commit-id: 7de3535d64 [formerly 3b738baba8] [formerly ba0194dff6dd3d0a89190211a15a136f32ca0270 [formerly af2707389c]]
Former-commit-id: 900d27f61f6ae40659280476bc184bfecf0849a7 [formerly 92851705fc]
Former-commit-id: 09eee9a31a
2013-10-28 12:14:27 -04:00
Steve Harris
cbf859daf6 14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
2013-10-28 10:55:16 -04:00
Steve Harris
c784003711 14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d [formerly aa59400b67] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4]
Former-commit-id: 472c0a1a5e
2013-10-28 10:46:02 -04:00
Steve Harris
719dfc4763 13.5.3-1 baseline
Former-commit-id: 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 30f65c2858 [formerly 1d8a2026f6 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]]
Former-commit-id: 30f65c2858
Former-commit-id: 2fbc08d837 [formerly 06f5dcf801] [formerly 2948c5d853c374ea9e8651c7b440ddb4ecbec60c [formerly 9df3027bf0]]
Former-commit-id: be609d4b1adcd5effdcbb5631255d6839db62e54 [formerly 43610e510c]
Former-commit-id: 0e99e713e6
2013-10-28 10:30:57 -04:00
Steve Harris
fc9955c2e0 Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java

Former-commit-id: 116d3822ac [formerly 64062fa355] [formerly 702b66ee52] [formerly 116d3822ac [formerly 64062fa355] [formerly 702b66ee52] [formerly ca54ffaad1 [formerly 702b66ee52 [formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]]]
Former-commit-id: ca54ffaad1
Former-commit-id: 426b0662dc [formerly 6aab62b7b9] [formerly 01e9c332c0bd50e8e46a912a79993920979d2cd9 [formerly 38e4e0c572]]
Former-commit-id: d8a3fc1a40537d39f3e081ace8795d06803bc0f7 [formerly 3a2a83bc4b]
Former-commit-id: 2864f20285
2013-10-25 10:51:42 -05:00
Steve Harris
e0d7e4cc22 13.5.2-13 baseline
Former-commit-id: e755dbb114 [formerly ba50a26e70] [formerly 2100a15013] [formerly e755dbb114 [formerly ba50a26e70] [formerly 2100a15013] [formerly e7b1702032 [formerly 2100a15013 [formerly f931b3b75bd2581c8942b43d73dff02de4362ecf]]]]
Former-commit-id: e7b1702032
Former-commit-id: a2442a8e39 [formerly 96c50ba394] [formerly 96aa43a7d3c8df257077a396b7cc0804a594105a [formerly bc3eff506b]]
Former-commit-id: 1340f052e588a7cd26a7455f448e5f92f5304a57 [formerly 6bff2d159f]
Former-commit-id: c71631dd28
2013-10-25 10:06:56 -04:00
Steve Harris
d1c823fe65 13.5.2-12 baseline
Former-commit-id: 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly bcb531e671 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]]
Former-commit-id: bcb531e671
Former-commit-id: 2e6e031198 [formerly 15d9848170] [formerly 7b3329db475d8a4c9b900f448656bc46192af5e3 [formerly b70ec5732d]]
Former-commit-id: d6cb813e26904b36ed5b21ea7664539b21d552fa [formerly 248e79aa2f]
Former-commit-id: f97c128cc8
2013-10-25 09:59:15 -04:00
Steve Harris
4cfed2d3dd 13.5.2-11 baseline
Former-commit-id: e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly cbfde2f52a [formerly b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]]
Former-commit-id: cbfde2f52a
Former-commit-id: a18eb8fe83 [formerly ecad06c80d] [formerly 65bc8a903da70f57f90d438452f29a0d3d26bc2a [formerly c1473d8a72]]
Former-commit-id: b061ebe0205bf516b503d42df7cfdb9aacce9a06 [formerly 49b1168f5e]
Former-commit-id: d63a07d248
2013-10-25 09:45:58 -04:00
Bryan Kowal
fc1ac25dd2 Issue #2297 - fix 14.2.1 CAVE build.
Former-commit-id: 8514f712fe [formerly 476c19464d] [formerly 8b3f402dd8] [formerly 8514f712fe [formerly 476c19464d] [formerly 8b3f402dd8] [formerly de09a30a4d [formerly 8b3f402dd8 [formerly d71631f5cabae72a1ceb30f36ce574b2559c235d]]]]
Former-commit-id: de09a30a4d
Former-commit-id: 534db16695 [formerly b8d164bb71] [formerly 8ab460e815a19bf685445346eb309cab37331493 [formerly 3eeefe9e56]]
Former-commit-id: b111380874f008f7cb0bdfbcb45e874f1d6920d3 [formerly c7a890d8c2]
Former-commit-id: ab3041ff05
2013-10-15 16:07:23 -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
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
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
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
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
Steve Harris
995b29e33c Merge branch 'master_14.1.1' (13.5.2-7) into omaha_14.1.1
Conflicts:
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/python.site-packages/Installer.qpid/component.spec

kept the omaha_14.1.1 versions of the .so files


Former-commit-id: 42cf95b398 [formerly 59f753ee0d] [formerly fc0cdf4996] [formerly 42cf95b398 [formerly 59f753ee0d] [formerly fc0cdf4996] [formerly 84ad96f2e0 [formerly fc0cdf4996 [formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]]]
Former-commit-id: 84ad96f2e0
Former-commit-id: 7fbcfe7e31 [formerly c2fa80310e] [formerly fdd4df5abe5cb73e831f675a386f04a37e52c5b9 [formerly c6a4241c5b]]
Former-commit-id: 88d1ef7b773b7f227f1e41ee678ac1173e134ee6 [formerly 9aa19b42b5]
Former-commit-id: 160a5819f9
2013-10-01 15:34:01 -05:00
Bryan Kowal
87750ddaef Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/build/p2-build.xml
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	edexOsgi/meteolib.jni.linux64/libmeteoLib.so
	javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.meteorological/.cproject
	nativeLib/rary.meteorological/src/dcapeFunc.c
	rpms/awips2.cave/Installer.cave-etc/component.spec
	rpms/awips2.cave/Installer.cave-feature/component.spec
	rpms/awips2.core/Installer.aviation/component.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: 3b7573154c [formerly bb5acf7c11] [formerly c125b5b053] [formerly 3b7573154c [formerly bb5acf7c11] [formerly c125b5b053] [formerly 9829477ced [formerly c125b5b053 [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]]
Former-commit-id: 9829477ced
Former-commit-id: f7009e8d15 [formerly 0f825df590] [formerly c64333277c4eb7175b863b7b0e456d69b1ec8730 [formerly ef789bf912]]
Former-commit-id: 4b8c9fd4d50ca4bb221c690f2c6e35cfe5c34531 [formerly 0efd4c7c50]
Former-commit-id: 7bd9ea3d30
2013-09-30 18:00:31 -05:00
Richard Peter
468ef4815e Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml

Former-commit-id: fb9a34e22a [formerly 4b934caa41] [formerly 92a45d77bb] [formerly fb9a34e22a [formerly 4b934caa41] [formerly 92a45d77bb] [formerly 271a8d753e [formerly 92a45d77bb [formerly 14284eb34f246c2d283ecf4040996957d7117cd3]]]]
Former-commit-id: 271a8d753e
Former-commit-id: 18268737b4 [formerly f23ea6e3ad] [formerly ad0c7e3be1948e8e01580b87275262dcbd92b650 [formerly 83dc5197a1]]
Former-commit-id: 67070831ebbb7c757e283b249d2ba402f461a1ef [formerly a00ad51154]
Former-commit-id: 57d31708f7
2013-09-24 12:29:16 -05:00
Steve Harris
6e9e71c2c6 13.5.2-6 baseline
Former-commit-id: 3cb4574635 [formerly 059549438a] [formerly 3821475d4e] [formerly 3cb4574635 [formerly 059549438a] [formerly 3821475d4e] [formerly 3837fbe670 [formerly 3821475d4e [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]]]
Former-commit-id: 3837fbe670
Former-commit-id: 4f4af06329 [formerly 557a7c87d5] [formerly 3c4113cbd9b34d856c9d3a2aa3b0c92346ba75b4 [formerly 22cb9b98cd]]
Former-commit-id: 5d26a3bd0b975f9318873a838bde4603b2acc0b7 [formerly f91cf37d43]
Former-commit-id: b7b8d4a0b7
2013-09-23 10:03:15 -04:00
Steve Harris
3a21a9eb6c 13.5.2-4 baseline
Former-commit-id: 3d0b711ccf [formerly 595e7bc0d9] [formerly e3c935d48b] [formerly 3d0b711ccf [formerly 595e7bc0d9] [formerly e3c935d48b] [formerly 58c6821427 [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]]
Former-commit-id: 58c6821427
Former-commit-id: a8201afb82 [formerly 4c6790f10f] [formerly 1a01e9adff02825a5599659ed7c17823430819bc [formerly abed443b59]]
Former-commit-id: d4668ee6901a6bb072be3a88eaad320aed699c0f [formerly e2398f74e5]
Former-commit-id: 609926f1f4
2013-09-12 11:13:59 -04:00
Bryan Kowal
24b03aada7 Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
Former-commit-id: a58482866f [formerly 6578b9a7de] [formerly 1adf764747] [formerly a58482866f [formerly 6578b9a7de] [formerly 1adf764747] [formerly 79e88c19aa [formerly 1adf764747 [formerly 4503735d3a05071878683f4a523d0dbd37e47ea3]]]]
Former-commit-id: 79e88c19aa
Former-commit-id: 7b209d0c22 [formerly 2a35fb001d] [formerly 4410ae3e4d51d61cc16e04ba9bb3b7110221a5a9 [formerly aa8eb47b95]]
Former-commit-id: 6a4e910bd056845f6fdb0a5b822d117601347bd7 [formerly 8dad5af165]
Former-commit-id: 39bd67265e
2013-09-06 12:30:01 -05:00
Bryan Kowal
7788062ef9 Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
Former-commit-id: 2374999571 [formerly 41ab242c2d] [formerly a02d910023] [formerly 2374999571 [formerly 41ab242c2d] [formerly a02d910023] [formerly 03cadc5aa9 [formerly a02d910023 [formerly 422e9b611535e9c20338041e0e1af62d38aab047]]]]
Former-commit-id: 03cadc5aa9
Former-commit-id: 2fbf708d37 [formerly 9c890422fa] [formerly a1835e61d037b5682286f5b833659d21414debeb [formerly 65bb1ec74b]]
Former-commit-id: 86188daec355e915f4360626abcc95dfc640869c [formerly bcb07a8f39]
Former-commit-id: 7ea8a63f32
2013-09-04 13:48:08 -05:00
Steve Harris
ff9e712630 Merge branch 'master_13.5.2' (13.5.2-2) into omaha_14.1.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	nativeLib/edexBridge/.cproject
	nativeLib/edexBridge/edexBridge.cpp
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/ld.so.conf.d/awips2-ldm-i386.conf
	rpms/awips2.qpid/0.18/SOURCES/awips.patch
	rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/build/common/rpms.sh

Former-commit-id: fec8541795 [formerly 433cc78081] [formerly 18ee1d0092] [formerly fec8541795 [formerly 433cc78081] [formerly 18ee1d0092] [formerly 7fe19d898c [formerly 18ee1d0092 [formerly b2674e0f626c643f0f81f865ea56351af2531c6a]]]]
Former-commit-id: 7fe19d898c
Former-commit-id: 0f6f34ec8c [formerly 55bbf0f747] [formerly 5a94406e31101181f9717f529104887e73712284 [formerly 0514103d87]]
Former-commit-id: 0a46a83928b6e3462cb1aa939abe80a85f2d9a5b [formerly 482b9d838d]
Former-commit-id: 5bb983c645
2013-09-03 16:05:44 -05:00
Bryan Kowal
147412207e Issue #2163 - RHEL6 14.1.1 build updates
Former-commit-id: 861a887084 [formerly 17d652a8dd] [formerly 9415560b38] [formerly 861a887084 [formerly 17d652a8dd] [formerly 9415560b38] [formerly ab3485a3ed [formerly 9415560b38 [formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]]]]
Former-commit-id: ab3485a3ed
Former-commit-id: ece1f596c6 [formerly 751f005228] [formerly dbc6b10841e1b6bd48ab2c5bb58813c728e5fbb6 [formerly 17b8ded082]]
Former-commit-id: 5eac7e9d81479e0f95630179883986d57bbb753f [formerly 6de01af674]
Former-commit-id: a8898ec348
2013-09-03 13:46:19 -05:00
Steve Harris
ed5b3c910e 13.5.1-19 baseline
Former-commit-id: 12f85e6c92 [formerly d50a0f64c9] [formerly 5b643065e9] [formerly 12f85e6c92 [formerly d50a0f64c9] [formerly 5b643065e9] [formerly 3b296a33b0 [formerly 5b643065e9 [formerly f3acac4ea9a285e64104a55db5b76593147c15e4]]]]
Former-commit-id: 3b296a33b0
Former-commit-id: bdaa93824d [formerly edad929d6a] [formerly 75009c0b37042f112b88cfc51b0c3d9555c67908 [formerly 3e27b2be1d]]
Former-commit-id: 7afcd2aafb5c6c07e90ce0f7253ed22c7c16831e [formerly 9e85745f8a]
Former-commit-id: 225c411e48
2013-09-03 09:48:08 -04:00
Steve Harris
7c47939632 13.5.2-2 baseline
Former-commit-id: 8dcd159377 [formerly 8cde3b2b54] [formerly 4a47fb97c5] [formerly 8dcd159377 [formerly 8cde3b2b54] [formerly 4a47fb97c5] [formerly 9e4bf0cf2e [formerly 4a47fb97c5 [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: c10c39b5d6 [formerly 12b0ab91fd] [formerly 8411cf39c13b7f63f746f4a1b8806ba15bfa7510 [formerly 5de6d566f0]]
Former-commit-id: ac9d4632081685ff126231e5a993f8fb95aba22d [formerly 180e042b5d]
Former-commit-id: db64b2e2d9
2013-08-29 15:01:29 -04:00
Steve Harris
85235051aa 13.5.2-1 baseline
Former-commit-id: 3cd0b2dfc6 [formerly 894d2425b2] [formerly 73dd0f166c] [formerly 3cd0b2dfc6 [formerly 894d2425b2] [formerly 73dd0f166c] [formerly 542b2c3d18 [formerly 73dd0f166c [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]]]
Former-commit-id: 542b2c3d18
Former-commit-id: b4e006162f [formerly 43af1b227a] [formerly 43ff166b6d3df833e29603f504019d7b3776a1d1 [formerly 4ecb349ed8]]
Former-commit-id: 551ebb34fc0bd9a337eef969bbbeff276486196a [formerly 4a9a91ce2e]
Former-commit-id: 1900cef156
2013-08-28 09:43:48 -04:00
Steve Harris
690e24905c 13.5.1-18 baseline
Former-commit-id: 80d8236464 [formerly d931b80e70] [formerly afb34814dd] [formerly 80d8236464 [formerly d931b80e70] [formerly afb34814dd] [formerly 0a7acf96c7 [formerly afb34814dd [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: ff31991527 [formerly 261b1da9d6] [formerly bef853d6001eb232a3c91986195c4ab5e86bc9cd [formerly 2f9aa87a9f]]
Former-commit-id: 9f45e3bbb3ed565bf3eab964a0ff4d2313fd7eda [formerly cde7f2a59c]
Former-commit-id: 6c258a0b7c
2013-08-22 09:12:43 -04:00
Bryan Kowal
038e4deef4 Issue #2163 - build the java and awips2-common-base rpms
Former-commit-id: fa69d98320 [formerly dd55894802] [formerly a3a5c799fc] [formerly fa69d98320 [formerly dd55894802] [formerly a3a5c799fc] [formerly 7f8226d319 [formerly a3a5c799fc [formerly dcd9e70f94deda8a26e8df00ee9bc8ffc13abe43]]]]
Former-commit-id: 7f8226d319
Former-commit-id: e63473681c [formerly 178b4904ef] [formerly 13c28d981888a56ba89f41db6a1eb715dc47ee3c [formerly 110fb14b91]]
Former-commit-id: 25b46948bc574e6bb3ed33397af485deae77cff5 [formerly 64fe4b6760]
Former-commit-id: cf5293fe91
2013-08-15 15:40:18 -05:00
Bryan Kowal
c236be07f6 Issue #2163 - copy additional httpd source to the rpm SOURCES directory
Former-commit-id: 18a3f63616 [formerly 4e3c577c56] [formerly 32f3e63bd5] [formerly 18a3f63616 [formerly 4e3c577c56] [formerly 32f3e63bd5] [formerly 382cb87fa3 [formerly 32f3e63bd5 [formerly b22a36d559ba6db6d1bd3d3c6785984353449a92]]]]
Former-commit-id: 382cb87fa3
Former-commit-id: 38c4f03c0a [formerly 6a129d3a96] [formerly bd8c04417fd168b2227cc23f892d33fc380013fa [formerly 50ab20be95]]
Former-commit-id: 503397f6e87caa0148f630463b4737d8b4056cee [formerly 2205b4a02f]
Former-commit-id: a533b3b52c
2013-08-15 15:40:05 -05:00
Bryan Kowal
67a52cd7b0 Issue #2163 - remaining RHEL6 RPM changes
- Amend: update build.sh to build the full set of rpms

Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f

Conflicts:
	rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0

Former-commit-id: 23fb13a41c [formerly 7d7511af9b] [formerly 19d80d96c3] [formerly 23fb13a41c [formerly 7d7511af9b] [formerly 19d80d96c3] [formerly c0458d512d [formerly 19d80d96c3 [formerly 45adc2b64e9037273e1013631ba7a8fbef400c35]]]]
Former-commit-id: c0458d512d
Former-commit-id: 2a9f4d41c9 [formerly f68943aeef] [formerly b7074896173a8852588739234ce215ff22e0dba5 [formerly 6b305d4ea3]]
Former-commit-id: ba3cdfa1c21458bf0f95c2202e0d7749db484d77 [formerly 5b55bd8c72]
Former-commit-id: a3f3f45f4b
2013-08-15 15:39:37 -05:00
Bryan Kowal
cb7e87d9a4 Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: fb1feea107 [formerly 683d7e5b19] [formerly c1dab22fdb] [formerly fb1feea107 [formerly 683d7e5b19] [formerly c1dab22fdb] [formerly 94eacfc460 [formerly c1dab22fdb [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]]]
Former-commit-id: 94eacfc460
Former-commit-id: 33b6f03899 [formerly 53124c5e02] [formerly b8d6af6f18e6e9e34cf5082362f7b792032c2de6 [formerly 75c6d4ebf6]]
Former-commit-id: e3b28978c51f9031cb777d8427d123b55b738085 [formerly eab659f961]
Former-commit-id: 2e6116a952
2013-08-15 15:30:05 -05:00
Bryan Kowal
cc84331809 Issue #2163 - additional RHEL6 changes
- updated edexBridge to use the QPID 0.18 API
- awips2-ldm is now ready for RHEL 6
- the QPID 0.18 rpms now build for RHEL 6
- disabled the build of QPID 0.7
- awips2-qpid-lib (new to RHEL 6) is now ready


Former-commit-id: 6e76fc6624 [formerly 5feab7c0be] [formerly bbca63a8b8] [formerly 6e76fc6624 [formerly 5feab7c0be] [formerly bbca63a8b8] [formerly 36eca9bbfb [formerly bbca63a8b8 [formerly d0f73c3852e45ec7b2363b46c77a94d7b3a47143]]]]
Former-commit-id: 36eca9bbfb
Former-commit-id: 45ab6afc31 [formerly 9b62e39fff] [formerly be9ce96e1e14d369e98c21317e7f54a4d7d48430 [formerly 1f5e92aac9]]
Former-commit-id: 371f2a79d88405004e831cbc983ff10de8c7cfeb [formerly 858a41c50d]
Former-commit-id: b32933f72a
2013-08-15 15:25:52 -05:00
Bryan Kowal
016bc8099d Issue #2163 - updates to PostgreSQL, psql, httpd-pypies, and httpd-collaboration rpms
- httpd has been updated for compatibility


Former-commit-id: 3074681a82 [formerly d3f5a8ecfd] [formerly 91a84e57b5] [formerly 3074681a82 [formerly d3f5a8ecfd] [formerly 91a84e57b5] [formerly c0614bc7d4 [formerly 91a84e57b5 [formerly 8298c43aba3850753b67ff002f71e02e70b12fb0]]]]
Former-commit-id: c0614bc7d4
Former-commit-id: b1bf843307 [formerly 68c89e6736] [formerly c5c75095cdb39d40899d94cb78da35c31632b661 [formerly ba04336262]]
Former-commit-id: ab7b60780791a6953edc75b72d16a7558fda6a96 [formerly 44722e1106]
Former-commit-id: 4df25d3b0f
2013-08-15 15:25:02 -05:00
Greg Armendariz
b264a9d841 13.5.1-13 baseline
Former-commit-id: 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 5577e686c1 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]]
Former-commit-id: 5577e686c1
Former-commit-id: 076a0b08ac [formerly 9f2f62427b] [formerly 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add]]
Former-commit-id: e2cd5730bab137f2b61daadd542fa1f16682d2c6 [formerly b66fcc40a5]
Former-commit-id: 0c61b62d24
2013-08-08 17:00:36 -04:00
Steve Harris
dded20dc93 13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 340e7bab60 [formerly a7d4c6274e] [formerly 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]]
Former-commit-id: 25e673600ebb4cafb2c67928841e30149139a498 [formerly 1a3197efdf]
Former-commit-id: 767b7fdb4d
2013-07-26 09:02:34 -04:00
Steve Harris
adf2f89d57 13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b [formerly cb50a0028d] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd]
Former-commit-id: 513c089375
2013-07-18 12:07:22 -04:00
Steve Harris
9f5469bc6e 13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901 [formerly 640b022e84] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922]
Former-commit-id: c05a6c8b50
2013-06-28 09:46:25 -04:00
Steve Harris
d3517d7c1d 13.5.1-3 baseline
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]]
Former-commit-id: 72d22a30c9
Former-commit-id: e1a5587dd0 [formerly deebdb874a] [formerly d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]]
Former-commit-id: 295839b2b350f5da0fea64ca71fc6c7482abe123 [formerly 1e939939b5]
Former-commit-id: 50d4376af7
2013-06-24 09:29:43 -04:00
Steve Harris
97a4c59662 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410 [formerly 0aab285b8a] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
Steve Harris
c57686831a 13.4.1-14 baseline
Former-commit-id: ffcce90f3f [formerly be236eb722] [formerly c749e122eb] [formerly ffcce90f3f [formerly be236eb722] [formerly c749e122eb] [formerly 18b90226a2 [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]]
Former-commit-id: 18b90226a2
Former-commit-id: f7316ae4bd [formerly cebc1ddb63] [formerly a7fc76319d4a743a6f6c8fc92e7f97e543ca980f [formerly dee685e3c7]]
Former-commit-id: 1e747c10c7b7049ff47d3fe068c65055d7ab4a0e [formerly 8ec7524cbb]
Former-commit-id: d46b0413fb
2013-06-06 15:15:27 -04:00
Steve Harris
603bc2535a 13.4.1-11 baseline
Former-commit-id: 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]]
Former-commit-id: c0376ce9ed
Former-commit-id: 5db95cce55 [formerly 4d88863515] [formerly d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48]]
Former-commit-id: b076884dd48bff50b64587e186d178820fa5b5cf [formerly 2767fd893c]
Former-commit-id: d9f967c811
2013-05-21 09:19:25 -04:00
Steve Harris
a2c35a5f3f 13.4.1-7 baseline
Former-commit-id: 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]]
Former-commit-id: 8347bed50e
Former-commit-id: 6e1e454a9f [formerly ff7a21ac37] [formerly f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661]]
Former-commit-id: fa4cea9874a8ab4f41eefd7e3ce4a2ea2b2883b4 [formerly dffa6d3bdc]
Former-commit-id: c7c6ea343e
2013-05-13 12:58:10 -04:00
Steve Harris
f04a1e8fc0 13.4.1-6 baseline
Former-commit-id: 5544c4a072 [formerly 6fcbb5ae6b] [formerly 8379977673] [formerly 5544c4a072 [formerly 6fcbb5ae6b] [formerly 8379977673] [formerly 16fe8cc5a2 [formerly 8379977673 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]]]]
Former-commit-id: 16fe8cc5a2
Former-commit-id: 5568ada76b [formerly 5be793f2f9] [formerly f649c7ad7b4bf50f9a110308d2253393bb3d2506 [formerly 979700c302]]
Former-commit-id: 772ececc049088d7fcf3524449b57d47ac45e322 [formerly 2e835dc591]
Former-commit-id: 5e54a425fb
2013-05-07 08:47:39 -04:00
Steve Harris
ba48ab0362 13.4.1-4 baseline
Former-commit-id: ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 7d085660f8 [formerly 4357e2dacc] [formerly 0d136c3db2023f33ea2f1f9c8c67dab99b99d829 [formerly 7828293d32]]
Former-commit-id: 6fc143d13d42b0d419bcede3614f0ee982260764 [formerly e0986cfda8]
Former-commit-id: 5dbfeb38ac
2013-05-02 10:00:38 -05:00
Steve Harris
b0fb1f49be 13.4.1-1 baseline
Former-commit-id: 79567aac51 [formerly f95e0ad10b] [formerly 2f517b7713] [formerly 79567aac51 [formerly f95e0ad10b] [formerly 2f517b7713] [formerly 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]]
Former-commit-id: 00332e6305
Former-commit-id: aecc3cfd89 [formerly 0e950655f1] [formerly fff69f92a60e6f16033e299ff1dd2395fac95290 [formerly 4accbb80db]]
Former-commit-id: 85465ead73fe31102e486ee012a5fcb51cfcc9b9 [formerly 4001e050e7]
Former-commit-id: 722e428c74
2013-04-24 17:15:55 -05:00
Steve Harris
b6db7821fa 13.3.1-19 baseline
Former-commit-id: 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]]
Former-commit-id: abaf9f12f9
Former-commit-id: fe5020d315 [formerly ed4150db5f] [formerly afa8971d2a4b49801835997c9e04d909cbb5917c [formerly 340a2cfb23]]
Former-commit-id: 8178539bb83f1e27afa01a5dd82705a3f18fc420 [formerly 7d76371536]
Former-commit-id: 7b7efd0bd1
2013-04-09 08:37:12 -05:00
Steve Harris
0cd73a41a1 13.3.1-18 baseline
Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: a196ebc11b [formerly 0edd049e3b] [formerly 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762]]
Former-commit-id: 88c12203c6853385a029c2fa9c3bdc8048aff152 [formerly 044912d48b]
Former-commit-id: fc009792e3
2013-04-03 14:58:29 -05:00