Commit graph

521 commits

Author SHA1 Message Date
Roger Ferrel
396cc261b2 Issue #1828 Fix intlsigmets and text pattern.
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0

Former-commit-id: df2a9d8f96 [formerly 6a4bd66abc] [formerly 19074d3053] [formerly df2a9d8f96 [formerly 6a4bd66abc] [formerly 19074d3053] [formerly 74389834de [formerly 19074d3053 [formerly 84448e12d2f09637bc4f79e42f21c11e561b8c37]]]]
Former-commit-id: 74389834de
Former-commit-id: dea028c7fc [formerly 7244b4d23c] [formerly ac5853bb00b807a9281ab41fb9a03069a5f9ac8e [formerly 4c5aa32169]]
Former-commit-id: a5932806895275b2c8af4b0f876ddbd93ef872a1 [formerly 8cdcee0ec5]
Former-commit-id: d76cbc6e80
2013-03-26 14:47:48 -05:00
Steve Harris
56522d8cf5 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 5fcfaf4360 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]]]
Former-commit-id: 65df96a419
Former-commit-id: 6e4b9a6f01 [formerly 5bb29627dc] [formerly db9839345c6d211e370f415e6567c95c5596977e [formerly 346b97a39a]]
Former-commit-id: 0576f0394c9924a93def2e1b0d821a8dd15e6468 [formerly fdd07bd72c]
Former-commit-id: 0bd1d5bdef
2013-03-26 12:47:40 -05:00
Steve Harris
d8a9db1e5c Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 8d1903034b [formerly 85104939ac] [formerly e71c69c383] [formerly 8d1903034b [formerly 85104939ac] [formerly e71c69c383] [formerly 9ff8a94193 [formerly e71c69c383 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]]]
Former-commit-id: 9ff8a94193
Former-commit-id: 072b1bf35e [formerly 02147470db] [formerly 9cd89cdae60b1bb313162de31e0e2c592984280a [formerly b926ff60b3]]
Former-commit-id: 75eb70e2f016a2173b886ec488d1cbc6651d6e51 [formerly 779adedea9]
Former-commit-id: 0d88cd619b
2013-03-26 12:44:24 -05:00
Steve Harris
a33631faa5 13.3.1-13 baseline
Former-commit-id: 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly c65f3e68e5 [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]]
Former-commit-id: c65f3e68e5
Former-commit-id: b49c1b0fa8 [formerly 4f2e9aec0d] [formerly 24c9dcc4807f8692b6eb63ba5946c346d7126d11 [formerly 822d05a709]]
Former-commit-id: 3a3a2fa20a832cb9027d27e82dc69e0c20123169 [formerly 7aa4f7b265]
Former-commit-id: 25a851cccf
2013-03-26 12:43:07 -05:00
Bryan Kowal
e7229e6124 Issue #1750 - include the qpidd service script in the rpm installations
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de

Former-commit-id: 41f03aaf7d [formerly 233f2c54be] [formerly c3936dd50e] [formerly 41f03aaf7d [formerly 233f2c54be] [formerly c3936dd50e] [formerly 21fa510eaa [formerly c3936dd50e [formerly c96c45074c220140b8774e1fceeab2b79820f033]]]]
Former-commit-id: 21fa510eaa
Former-commit-id: 154bedca1d [formerly f8fafc8d4a] [formerly 1488501309286ce57335dc6761ded04fe446c3fa [formerly db39a45c88]]
Former-commit-id: 011a44105665b50f56331fc21dda723ff864dd90 [formerly 01d571a088]
Former-commit-id: 2d5d41e214
2013-03-25 16:52:33 -05:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Richard Peter
e62f6880db Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: d6a8b05c22 [formerly ead48007cb] [formerly 9fdeb37a48] [formerly d6a8b05c22 [formerly ead48007cb] [formerly 9fdeb37a48] [formerly 4c3fcf3b67 [formerly 9fdeb37a48 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]]]
Former-commit-id: 4c3fcf3b67
Former-commit-id: fced329e1c [formerly 4b386ccd1c] [formerly 2df7d0be62beef434695ff1afbbde3cec46a63ce [formerly 704bc86cf5]]
Former-commit-id: b5d724833aad45d35e88e62204aca2b28b69dbf0 [formerly 1cb743c14a]
Former-commit-id: 3a0627b5d1
2013-03-21 18:21:53 -05:00
Greg Armendariz
e4d51820e2 Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
Former-commit-id: 65d6bc8cd7 [formerly 1e1aea8a40] [formerly 6af1a22e56] [formerly 65d6bc8cd7 [formerly 1e1aea8a40] [formerly 6af1a22e56] [formerly 85113a66b6 [formerly 6af1a22e56 [formerly 7403214a115b0b856f94da1e86288307af952d77]]]]
Former-commit-id: 85113a66b6
Former-commit-id: 8550ade3ba [formerly 1884b6dce3] [formerly 3a1d4dd5377fe137da9052d33161f1179569101d [formerly ccabddace6]]
Former-commit-id: 8865116ee2a1c8adf793566471920cb0699d0ba9 [formerly 559136f546]
Former-commit-id: f9d1bfbb48
2013-03-21 12:55:59 -05:00
Bryan Kowal
fc836cda4f Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694

Former-commit-id: 2395ca0b3b [formerly 574f6cf4ad] [formerly 4e37fa6627] [formerly 2395ca0b3b [formerly 574f6cf4ad] [formerly 4e37fa6627] [formerly 5b15c6fcaa [formerly 4e37fa6627 [formerly b756d55e91a553623fb61de2673f87d81351ca9b]]]]
Former-commit-id: 5b15c6fcaa
Former-commit-id: 95b9e9b751 [formerly 88b0c2e120] [formerly 77e7359cd424f1e3096c107873683b66ceb81137 [formerly 8141f49211]]
Former-commit-id: 1800cbc92a8918b59f5980df4cafec6fab28acd7 [formerly 6e9c94566c]
Former-commit-id: 17c46599a4
2013-03-21 10:04:29 -05:00
Bryan Kowal
a9dd3bd622 Issue #1663 - awips2-database will no longer install site-specific databases.
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
  will be purged by the localization rpm once it is finished with them

Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6

Former-commit-id: 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 722d068105 [formerly ab135933da [formerly e4181aff738a926738ccabcd2c09706670a43924]]]]
Former-commit-id: 722d068105
Former-commit-id: 854ae5b462 [formerly ac0ef6e7b9] [formerly 587033a1da78250dbb1cee2033955c635e17a488 [formerly 5ab931d15e]]
Former-commit-id: 89161e5b870ee347472b5c502d2e0e15dad5f881 [formerly 5ca46505e0]
Former-commit-id: 0f5a5e71b7
2013-03-21 09:50:48 -05:00
Steve Harris
616cddf60c Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly 0379be06d2 [formerly e2496455b2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]]]
Former-commit-id: 0379be06d2
Former-commit-id: 0a86e74ea5 [formerly 8db98c2d71] [formerly 1678ef2604a244a5bc388e58878b710069703255 [formerly 4fc2bb7bba]]
Former-commit-id: f6d20e2ee3c08859d481aeb137ed2ce12d7d43af [formerly a91fcf98a2]
Former-commit-id: 961c0b56a7
2013-03-20 16:09:26 -05:00
Steve Harris
2b05476c98 Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly dc419068f0 [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]]
Former-commit-id: dc419068f0
Former-commit-id: 2cbd2a1bc9 [formerly f4e26fd94d] [formerly 64b470b4de5f62b27c8e9b8b00161d778a7472ba [formerly 31044eabd1]]
Former-commit-id: 3df5100c782adf8e60ee861fd034fa4cad0232ba [formerly 8065161896]
Former-commit-id: c129fed15e
2013-03-20 16:06:20 -05:00
Steve Harris
1261f1dbf9 13.3.1-10 baseline
Former-commit-id: 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]]
Former-commit-id: 7078eec1b1
Former-commit-id: dbeb388d72 [formerly e9f0328808] [formerly 023f42cbdef7d2df7347dbb273b58245adbc07be [formerly 7c2e617d26]]
Former-commit-id: a425f5b8a103c063bd8067c0d4a3f1cbedcd8f01 [formerly f2cc967a4f]
Former-commit-id: e6ab10cc26
2013-03-20 15:53:01 -05:00
Bryan Kowal
bb8b9b69da Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
Former-commit-id: fa0f882050 [formerly 448518579a] [formerly cbe9b30266] [formerly fa0f882050 [formerly 448518579a] [formerly cbe9b30266] [formerly 74b4bb0891 [formerly cbe9b30266 [formerly ed4c603c2fdb7bc1c8eeff0e3ea598f75725c17f]]]]
Former-commit-id: 74b4bb0891
Former-commit-id: c7403dffe2 [formerly 6b8538f7f5] [formerly 3ba7c5a5f785e32de3db6c45c7f138af8ec9aa79 [formerly 7628860bfe]]
Former-commit-id: d011da6f3e84b53833888641711e30f0f78af275 [formerly cb78a6af53]
Former-commit-id: b05b21401f
2013-03-19 13:27:38 -05:00
Steve Harris
4c10c7a5be Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 027eda5dce [formerly 2a26783ba7] [formerly 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde]]
Former-commit-id: 8012cd58ae8927dc32f50de6d568a7829c75f0a6 [formerly 22bb7ecd33]
Former-commit-id: 481cee4c74
2013-03-18 16:52:00 -05:00
Steve Harris
c1bb0c2749 Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]]]
Former-commit-id: c18b96dc4c
Former-commit-id: 0e9919f6be [formerly ea27f9cd17] [formerly e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8]]
Former-commit-id: e6c80b59106bc4b2d5423de97088b928e09b489c [formerly fc6748cb3e]
Former-commit-id: 9d4d1baefe
2013-03-18 16:43:22 -05:00
Bryan Kowal
33b56397a3 Issue #1741 - what was once two is now one
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts


Former-commit-id: 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 7fd035256d [formerly b954bc17bf [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]]]
Former-commit-id: 7fd035256d
Former-commit-id: 9d8b41c8c7 [formerly 3e8d5449fc] [formerly 5c7fdb0ba007173bdb27684c17eee947cc76d90b [formerly 66e2ed79ec]]
Former-commit-id: 91ab574f18aa46466914129e5425a627996ad4d1 [formerly 56f2b3f0c2]
Former-commit-id: 81ebbd5a5b
2013-03-18 16:36:33 -05:00
Steve Harris
0b0c5e4bec 13.3.1-8 baseline
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 2fd4ac9397 [formerly 81a3f29afc] [formerly 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]]
Former-commit-id: 419ae74464bf2fde736619a602f8bbae8a6b4c86 [formerly 0c94cc97fb]
Former-commit-id: 1c2dffd66d
2013-03-18 15:43:32 -05:00
Bryan Kowal
f1854dd760 Issue #1663 - PostgreSQL Upgrade
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
   * geos 3.3.7
   * postgis 2.0.2
   * proj 4.8.0
   * gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers

Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8

Former-commit-id: 9e678feaf8 [formerly db02ab18ed] [formerly 729bc9c4bb] [formerly 9e678feaf8 [formerly db02ab18ed] [formerly 729bc9c4bb] [formerly 5e86ef080e [formerly 729bc9c4bb [formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]]]
Former-commit-id: 5e86ef080e
Former-commit-id: 0b6a31d7ca [formerly f6139755a5] [formerly 916fa7115cb561d798c47318a5834ec0854bf491 [formerly 58e035a024]]
Former-commit-id: 53b06b05ba798c5f2f0c58de3b9cd5f1c88b5850 [formerly 1e9054ce15]
Former-commit-id: ea0950d836
2013-03-13 14:44:05 -05:00
Dave Hladky
b111edeb8b Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 68114535f2 [formerly 9e97fc9efe] [formerly b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]]
Former-commit-id: 39e44db397ec904e6c2a1254ad2d956f2cd9c180 [formerly cb5ee4a7b8]
Former-commit-id: b85e19282b
2013-03-13 13:56:33 -05:00
Steve Harris
352658125b 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d [formerly ed5f1dbab6] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd]
Former-commit-id: 88b28c39c1
2013-03-13 09:50:28 -05:00
Steve Harris
3b10c0e0b7 13.3.1-6.1 baseline
Former-commit-id: 3ea50babf5 [formerly 6d96471b9b] [formerly fa9d260c2b] [formerly 3ea50babf5 [formerly 6d96471b9b] [formerly fa9d260c2b] [formerly a062803c8c [formerly fa9d260c2b [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]]]
Former-commit-id: a062803c8c
Former-commit-id: f92bc8f3d4 [formerly 2e1dbdc10d] [formerly 38ded82c18c6e60a96a3dd85d4c9dd3d0ed218fe [formerly bfa25f3330]]
Former-commit-id: c57d4dca8ae0fdf1532461d5c287fa8b8cb94434 [formerly c038384685]
Former-commit-id: a5b96e0c3c
2013-03-13 08:28:26 -05:00
Steve Harris
072065191b Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 4c4c79036c [formerly 36261cb095] [formerly 753a5213ab] [formerly 4c4c79036c [formerly 36261cb095] [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 753a5213ab [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: 47cde9bd09 [formerly bca46a1354] [formerly 2726614c378a7a21453ace53443d019d65cea76e [formerly d5bcdb0015]]
Former-commit-id: afba0e5b2a5a76c08ffa616eefd96f2ca6363113 [formerly 5232592cfa]
Former-commit-id: 346b22b196
2013-03-12 16:04:23 -05:00
Dave Hladky
87992329b4 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]]
Former-commit-id: 4b08491880
Former-commit-id: eefd544e4b [formerly 155903d135] [formerly ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de]]
Former-commit-id: 70f3f744097c668c89b07b6780fc8db6c04380d8 [formerly 29ed641a13]
Former-commit-id: cdfbcc7136
2013-03-12 15:48:34 -05:00
Steve Harris
ed1788343e 13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]
Former-commit-id: 566b677d09
Former-commit-id: 0cec06c171 [formerly 6fe4b16924] [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]]
Former-commit-id: 0e585016165e18d475399f775c1938136de541c6 [formerly c6f379f59a]
Former-commit-id: c28f3aeb02
2013-03-12 08:35:45 -05:00
Steve Harris
b64731872c Merge branch 'omaha_13.3.1' into development
Former-commit-id: afd934db35 [formerly 6b13492420] [formerly d5b80f9225] [formerly afd934db35 [formerly 6b13492420] [formerly d5b80f9225] [formerly aa0e9acefd [formerly d5b80f9225 [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 1709c34b8f [formerly 4a0b8772ec] [formerly 6d472393251484c670223cabe82285a18503dc7c [formerly b9563da8a8]]
Former-commit-id: ad6ef96c444820a88fa41f79cf60d91bc2c26386 [formerly 46d0c9fcee]
Former-commit-id: 2b489e4e40
2013-03-05 12:29:44 -06:00
Steve Harris
2104c8b533 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]]
Former-commit-id: 57f42761d7
Former-commit-id: 7ff64bf8cc [formerly b423579e4a] [formerly 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]]
Former-commit-id: 276acc0cf2f69b884f078f338890570213eec929 [formerly b630339eb7]
Former-commit-id: d842ed88a7
2013-03-05 12:27:49 -06:00
Steve Harris
f20c87110e 13.3.1-5 baseline
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]]
Former-commit-id: e26f7eb151
Former-commit-id: aabd5cd51f [formerly a240379588] [formerly 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]]
Former-commit-id: 8b4bd6790f2136380dbac557b452d873c77bacc6 [formerly 1f98e01c57]
Former-commit-id: 79ff805090
2013-03-05 10:47:06 -06:00
Steve Harris
52aae101cc 13.3.1-4 baseline
Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]]
Former-commit-id: 2edca90902
Former-commit-id: 4bfbb518c0 [formerly 3e0614b43a] [formerly c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9]]
Former-commit-id: e4eaa93661df211ab065d6c9dd5f042f5011f151 [formerly 0df35cc5ec]
Former-commit-id: 153aadc1d7
2013-03-05 10:39:59 -06:00
Bryan Kowal
ebec988cac Issue #1750 - edexBridge will now set the QPID persistence flag
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98

Former-commit-id: b407a34461 [formerly d484acbca0] [formerly 3a8efd5edf] [formerly b407a34461 [formerly d484acbca0] [formerly 3a8efd5edf] [formerly 8b4dce1c3d [formerly 3a8efd5edf [formerly d466b647d0d810418a88c875f39e55d98d680aa1]]]]
Former-commit-id: 8b4dce1c3d
Former-commit-id: 553f988935 [formerly 0d9400b2ec] [formerly 7570c6107ddb950a2b736fd6b01c90c29e178ab4 [formerly eba8ccc6cd]]
Former-commit-id: 38209d670d15d376adafb37ba781ff002f8b28b6 [formerly 4204310294]
Former-commit-id: 80cb164e61
2013-03-04 17:58:04 -06:00
Bryan Kowal
e23e2eeec2 Issue #1739 - fix Wes2Bridge
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814

Former-commit-id: 18a778cb8c [formerly 9022c53d53] [formerly 20d3c6bcaa] [formerly 18a778cb8c [formerly 9022c53d53] [formerly 20d3c6bcaa] [formerly 86a1f16e37 [formerly 20d3c6bcaa [formerly b74410b2e816686ed9525e3e8a80c17096e6aadb]]]]
Former-commit-id: 86a1f16e37
Former-commit-id: 0a93a4a25c [formerly 5958c0a876] [formerly 12218fd7f3fba3ae75003e4e79567e4ffd54c4d1 [formerly ed6e1003ff]]
Former-commit-id: 41c069f5b278b4893f615956f01f3a05822496ce [formerly 0e2cad14b2]
Former-commit-id: d0eb95dbbe
2013-03-01 11:49:09 -06:00
Bryan Kowal
cfaaafbd5a Issue #1739 - updates for recent CAVE and EDEX feature-refactoring
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue

Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc

Former-commit-id: 875c17399a [formerly f806c880d3] [formerly d081a2afcd] [formerly 875c17399a [formerly f806c880d3] [formerly d081a2afcd] [formerly 4faf8aefbe [formerly d081a2afcd [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]]]
Former-commit-id: 4faf8aefbe
Former-commit-id: e005f18132 [formerly c4709b1bfb] [formerly 7cd233f6e540666556c9d7a93a89b4d6dfd51ec6 [formerly 497bf33892]]
Former-commit-id: a05976388b8f7d2005143e0d29a6962ef9b7b34e [formerly cb5a2677b9]
Former-commit-id: 4d50fec21f
2013-02-28 18:09:25 -06:00
Bryan Kowal
b8abcf8692 Issue #1638 - update CAVE rpm name generation
Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f

Former-commit-id: 37e9c0cb20 [formerly a9123a2b84] [formerly b8496877ff] [formerly 37e9c0cb20 [formerly a9123a2b84] [formerly b8496877ff] [formerly 5eb888fb98 [formerly b8496877ff [formerly 7cf0100415245ae81fa232e398936fe33a2b1bc3]]]]
Former-commit-id: 5eb888fb98
Former-commit-id: 6f57b06d52 [formerly da0d99d22f] [formerly 16e35fbbb02090042f28676c5c7015864604ab11 [formerly 22acca8f3d]]
Former-commit-id: 8a05919b3352b9c20cdce27168ba0ceb43d51c4c [formerly 3c2210c80d]
Former-commit-id: bc668bc828
2013-02-28 14:43:53 -06:00
Richard Peter
0a5fc08b3e Merge "Issue #1576 - all of the qpid broker-plugins will now be built and included in the qpid broker rpm" into development
Former-commit-id: bcd6b4d82b [formerly b354ebb862] [formerly 6c766ddd85] [formerly bcd6b4d82b [formerly b354ebb862] [formerly 6c766ddd85] [formerly 84e1b2f999 [formerly 6c766ddd85 [formerly d89e15dc9528bfbc67f67cc1d8a2989e7390131d]]]]
Former-commit-id: 84e1b2f999
Former-commit-id: f3528bedea [formerly 0f1c3dd256] [formerly 1d88c5c600f75ba32fbd740729eacc1432ef74f4 [formerly 9fa37933e6]]
Former-commit-id: aba90ab67ec4f2013fcb3a9461b728e2addec1ff [formerly eff7670694]
Former-commit-id: 4b22cf71f4
2013-02-27 11:43:18 -06:00
Steve Harris
9d9a17aa64 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 6ec9e73035 [formerly 67f090638f [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]]
Former-commit-id: 6ec9e73035
Former-commit-id: f30d1cdf87 [formerly e46625f8f2] [formerly bd72fedeff4f0ceca04ec0a96bb50b7706e7a460 [formerly 0051276ad1]]
Former-commit-id: 8958c8255ceab6eb6c8e58c5cb4c8a688e5de950 [formerly 140ae3191c]
Former-commit-id: 9db68d0585
2013-02-25 15:58:48 -06:00
Bryan Kowal
18b7aaed49 Issue #1634 - force added wrapper jars in bin directory
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48

Former-commit-id: 6f419ae22f [formerly 4cd5453e0a] [formerly 7c62991edf] [formerly 6f419ae22f [formerly 4cd5453e0a] [formerly 7c62991edf] [formerly d5c8b82941 [formerly 7c62991edf [formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]]]
Former-commit-id: d5c8b82941
Former-commit-id: ec53fa98cd [formerly 53b9e69868] [formerly e7559e2861931ac623033c77973bf5ebff63f7c9 [formerly 5a5914c010]]
Former-commit-id: e900cecc385d0b35cf2613204f84c8aac131bc81 [formerly fd17273cb2]
Former-commit-id: dd7eda15aa
2013-02-22 09:28:37 -06:00
Steve Harris
34d0f59592 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 7e48d3e684 [formerly 4f155a183a] [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]]
Former-commit-id: 52ef36f1490e95f8582d69438eed38f21061eafb [formerly f3c3191a1c]
Former-commit-id: b5d9e75b95
2013-02-21 15:41:39 -06:00
Bryan Kowal
55b55a1255 Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...


Former-commit-id: 0d4a63efe4 [formerly 519ce2c0fb] [formerly a8fb04f41c] [formerly 0d4a63efe4 [formerly 519ce2c0fb] [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a8fb04f41c [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]]
Former-commit-id: 803397c7c7
Former-commit-id: 6a47017449 [formerly b2a0a7c148] [formerly 6195241ffacf1c8bdcb22aae44f96bfee0eedf78 [formerly 450e8e7a4c]]
Former-commit-id: 302b1a5ae96498f9e93f50ccd303b89ce6085fa5 [formerly 2a21f2624b]
Former-commit-id: b88a24574b
2013-02-21 13:55:28 -06:00
Steve Harris
fac2d20002 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0]
Former-commit-id: 8c828dbd75
2013-02-20 16:19:40 -06:00
Steve Harris
b7446ac966 Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]]
Former-commit-id: d123c044c3
Former-commit-id: bca88ba9c7 [formerly 81f1fb83a0] [formerly d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38]]
Former-commit-id: cb9ccc383baf32e35d0325fdfa001bdd7a62b969 [formerly 5a33182da5]
Former-commit-id: 77a66598fe
2013-02-19 12:22:00 -06:00
Steve Harris
7cc8f5879d Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1
Former-commit-id: fcef63a7af [formerly b8720e185d] [formerly 1874b07ab4] [formerly fcef63a7af [formerly b8720e185d] [formerly 1874b07ab4] [formerly 6318348e3b [formerly 1874b07ab4 [formerly c397745e9c36a88bf71d87b671f0a8c826e117ea]]]]
Former-commit-id: 6318348e3b
Former-commit-id: 435be40166 [formerly 85fa1539ef] [formerly b6bfbd19eba2539cd1cfc863faeaf188664f3a8f [formerly 4777c782e2]]
Former-commit-id: 66fc4af51586eb362c988e619a639fb8058c19f2 [formerly 71edff51e2]
Former-commit-id: e4a430b3a9
2013-02-18 09:52:22 -06:00
Steve Harris
def834c9a2 Issue #1632 - new FOSS licenses added for Data Delivery plugins
Former-commit-id: 0e7cd27efc [formerly 049c219f2b] [formerly 02ec634536] [formerly 0e7cd27efc [formerly 049c219f2b] [formerly 02ec634536] [formerly b9ce5b8b35 [formerly 02ec634536 [formerly 82d2a8bdfe9a82cce28637153c8cbb169bd1aa5a]]]]
Former-commit-id: b9ce5b8b35
Former-commit-id: 6c16384c5c [formerly 7a9501de55] [formerly 93562620757b43bfd2d1bd9159c4db359d64f1ad [formerly 3c3681420e]]
Former-commit-id: 1f44d6f4998a2d1af45e7b51fcd2cd356a71ab38 [formerly daba9ecc43]
Former-commit-id: a488f3d978
2013-02-18 09:39:31 -06:00
Steve Harris
0b53108cbe 13.2.1-8 baseline
Former-commit-id: d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]]
Former-commit-id: 053156f02e
Former-commit-id: db02d32440 [formerly 8cffb55371] [formerly 609380ceb2a4b7bcee69d80b0285d0756125ad49 [formerly c6d584758f]]
Former-commit-id: db6d42ff3ca25509616d69de95cc4fe49742d3a6 [formerly edac913af7]
Former-commit-id: 32ad300b47
2013-02-18 09:09:41 -06:00
Bryan Kowal
e85d781dfc Issue #1576 - all of the qpid broker-plugins will now be built and included in the qpid broker rpm
- the baselined AWIPS II Jetty was incompatible with qpid; so, the expected version of jetty will be used
- source jars will no longer be included in the rpms

Change-Id: I8172800bfbc31be7117c490e828ebfc1e2355774

Former-commit-id: 815ad5b07d [formerly 306842b297] [formerly 612d4fca1f] [formerly 815ad5b07d [formerly 306842b297] [formerly 612d4fca1f] [formerly 917bc533d6 [formerly 612d4fca1f [formerly 30086ab14cfaab149a689b84803ac906754ddd13]]]]
Former-commit-id: 917bc533d6
Former-commit-id: 72d844d751 [formerly 92e5f2df54] [formerly acb15021906a2fbc2d6f7f79ec35350ccb2b9bf7 [formerly d94543a01c]]
Former-commit-id: 85d4a2ff7305b1f728d24c90c0d09092160b681c [formerly 7ceaba25df]
Former-commit-id: 25802d7d2d
2013-02-11 15:13:07 -06:00
Richard Peter
462d7f4e3c Merge "Issue #1576 - updated qpid 0.18 rpms" into development
Former-commit-id: 1e07d66c7f [formerly bb317b1acf] [formerly 221a6e1ca1] [formerly 1e07d66c7f [formerly bb317b1acf] [formerly 221a6e1ca1] [formerly b774fadb60 [formerly 221a6e1ca1 [formerly 16b20a7f05e0a16ef02881a950bd541f7b4a4a1e]]]]
Former-commit-id: b774fadb60
Former-commit-id: 928aa2cfcc [formerly 2e02b222f2] [formerly 247a9d4fe6c3743d5405cc1ae8912c81d4b14a04 [formerly fa4dd004f9]]
Former-commit-id: 82f2b9bfe531f0692c01403cca357d9bf19a2038 [formerly b4192e72c8]
Former-commit-id: 7fbd24e723
2013-02-05 09:25:55 -06:00
Bryan Kowal
66a9f439b3 Issue #1576 - updated qpid 0.18 rpms
- the broker-plugins/management-jmx module is now built
- the broker-plugins-management-jmx plugins and the common-management plugins are now included in the rpms

Change-Id: I273772b2fb8f339a55cc3e523f90ca3b2398b222

Former-commit-id: e839188ca1 [formerly 145cd06eae] [formerly 1678618015] [formerly e839188ca1 [formerly 145cd06eae] [formerly 1678618015] [formerly 09523f1e84 [formerly 1678618015 [formerly c43c4268ba13e5758dfb4c504d57dead5ae89d63]]]]
Former-commit-id: 09523f1e84
Former-commit-id: 3d6d5e37b7 [formerly fe70d57c36] [formerly 86ff68fed5e171beed0483e50df55cec431c39b9 [formerly 513bda11bc]]
Former-commit-id: cb08005a122e513c75f9e40399cc85c13a1ddd35 [formerly 88d5830873]
Former-commit-id: c92b997909
2013-02-04 12:31:23 -06:00
Brad Gonzales
b27bb93cf7 Issue #1517 Added SPC Prob menu changes.
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
       Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
       Updated units in spcGuideNDFD.xml.
       Removed local configuration menu items and tags.
       Updated pqact.conf.template SPC entry.
       Update SPC.py with levels.

Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1

Former-commit-id: 7cef72a460 [formerly 35cc853c74] [formerly f459554e33] [formerly 7cef72a460 [formerly 35cc853c74] [formerly f459554e33] [formerly 5bc6dd5498 [formerly f459554e33 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 3e4338339b [formerly 8fc5c18ebd] [formerly 62d4c20906235f41b4a9b49850da7af9a09a8dfd [formerly f3ef309293]]
Former-commit-id: 8092a6222319cfb79a0aacf062d8e75239f377da [formerly adbfa7ced1]
Former-commit-id: 7253bbf20e
2013-02-04 08:52:33 -06:00
Steve Harris
a8d7e2a51a Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]]
Former-commit-id: ec56acde81
Former-commit-id: 41b14f0fa2 [formerly 73d9455c65] [formerly 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61 [formerly 6383bf8ed2]]
Former-commit-id: 96b2d429acce04d3a7b895e5c4de0e318433555e [formerly a74d58ce6f]
Former-commit-id: 2107a54161
2013-01-31 10:19:14 -06:00
Steve Harris
3165545bb6 Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]]
Former-commit-id: 6040272573
Former-commit-id: c9bc690eca [formerly 75f6e61e6f] [formerly 53394d76c4582419b448c742c4d56f7d91e3eff7 [formerly 513d49939f]]
Former-commit-id: 97adf3dc9cd6eed17f75fee6569131485caea1a3 [formerly ba97151132]
Former-commit-id: 99bc358644
2013-01-29 15:57:21 -06:00
Steve Harris
d552dc5ffb 13.2.1-3 baseline
Former-commit-id: b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: 03989493ae [formerly daca1c3e73] [formerly aad469752c5128fb65382f8daefbea8fbb0e4069 [formerly 3edfa1e0be]]
Former-commit-id: 4abc68d3bc26a4259383e44830f853678146e7ed [formerly dbaf4a3e39]
Former-commit-id: 9ab34b7aeb
2013-01-29 15:52:43 -06:00