xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2233 commits 31 branches 40 tags 3.8 GiB
Commit graph

215 commits

Author SHA1 Message Date
Richard Peter
d6a8b05c22 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: 4c3fcf3b67 [formerly 9fdeb37a48 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]
Former-commit-id: 9fdeb37a48
Former-commit-id: ead48007cb
 2013-03-21 18:21:53 -05:00
Greg Armendariz
65d6bc8cd7 Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development 
Former-commit-id: 85113a66b6 [formerly 6af1a22e56 [formerly 7403214a115b0b856f94da1e86288307af952d77]]
Former-commit-id: 6af1a22e56
Former-commit-id: 1e1aea8a40
 2013-03-21 12:55:59 -05:00
Bryan Kowal
2395ca0b3b Issue #1750 - add clean scriptlet to pgadmin3 rpm specification 
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694

Former-commit-id: 5b15c6fcaa [formerly 4e37fa6627 [formerly b756d55e91a553623fb61de2673f87d81351ca9b]]
Former-commit-id: 4e37fa6627
Former-commit-id: 574f6cf4ad
 2013-03-21 10:04:29 -05:00
Bryan Kowal
0ef2ee6e49 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: 722d068105 [formerly ab135933da [formerly e4181aff738a926738ccabcd2c09706670a43924]]
Former-commit-id: ab135933da
Former-commit-id: 4d3731bf6d
 2013-03-21 09:50:48 -05:00
Steve Harris
b7994fb77b 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: 0379be06d2 [formerly e2496455b2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]
Former-commit-id: e2496455b2
Former-commit-id: 0055a3213d
 2013-03-20 16:09:26 -05:00
Steve Harris
ea052b14bb 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: dc419068f0 [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]
Former-commit-id: fa15f03e1b
Former-commit-id: a9ced3a7ef
 2013-03-20 16:06:20 -05:00
Steve Harris
76ea9120d8 13.3.1-10 baseline 
Former-commit-id: 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 073687d9a9
Former-commit-id: 57f4676b6c
 2013-03-20 15:53:01 -05:00
Bryan Kowal
fa0f882050 Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base 
Former-commit-id: 74b4bb0891 [formerly cbe9b30266 [formerly ed4c603c2fdb7bc1c8eeff0e3ea598f75725c17f]]
Former-commit-id: cbe9b30266
Former-commit-id: 448518579a
 2013-03-19 13:27:38 -05:00
Steve Harris
b64fbe549a 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: 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: b8f0635ad6
Former-commit-id: 28ef804e1b
 2013-03-18 16:52:00 -05:00
Steve Harris
3e69490ab2 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: c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]
Former-commit-id: 1a999fee5a
Former-commit-id: 27c418812f
 2013-03-18 16:43:22 -05:00
Bryan Kowal
4f808edba3 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: 7fd035256d [formerly b954bc17bf [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]
Former-commit-id: b954bc17bf
Former-commit-id: a93dcff1b5
 2013-03-18 16:36:33 -05:00
Steve Harris
dd30a5f940 13.3.1-8 baseline 
Former-commit-id: c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: f97d78994b
Former-commit-id: bc9df0a8f9
 2013-03-18 15:43:32 -05:00
Bryan Kowal
9e678feaf8 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: 5e86ef080e [formerly 729bc9c4bb [formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]
Former-commit-id: 729bc9c4bb
Former-commit-id: db02ab18ed
 2013-03-13 14:44:05 -05:00
Dave Hladky
7d2c1bc4d5 Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1 
Former-commit-id: 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 38b952a220
Former-commit-id: 765be278bb
 2013-03-13 13:56:33 -05:00
Steve Harris
23faf84455 13.3.1-7 baseline 
Former-commit-id: e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: a72254cc75
Former-commit-id: 97d2f521e4
 2013-03-13 09:50:28 -05:00
Steve Harris
3ea50babf5 13.3.1-6.1 baseline 
Former-commit-id: a062803c8c [formerly fa9d260c2b [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]
Former-commit-id: fa9d260c2b
Former-commit-id: 6d96471b9b
 2013-03-13 08:28:26 -05:00
Steve Harris
4c4c79036c 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: 0cd7e56e65 [formerly 753a5213ab [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]
Former-commit-id: 753a5213ab
Former-commit-id: 36261cb095
 2013-03-12 16:04:23 -05:00
Dave Hladky
e17f8e0511 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: 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: a1006667e0
Former-commit-id: 5c65862b8f
 2013-03-12 15:48:34 -05:00
Steve Harris
4eef6862d6 13.3.1-6 baseline 
Former-commit-id: 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 3a4c7931e1
Former-commit-id: 2e110bd151
 2013-03-12 08:35:45 -05:00
Steve Harris
afd934db35 Merge branch 'omaha_13.3.1' into development 
Former-commit-id: aa0e9acefd [formerly d5b80f9225 [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: d5b80f9225
Former-commit-id: 6b13492420
 2013-03-05 12:29:44 -06:00
Steve Harris
3ec20c1689 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1 
Former-commit-id: 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 305dd72969
Former-commit-id: 61a19a460b
 2013-03-05 12:27:49 -06:00
Steve Harris
e4a1c61ad5 13.3.1-5 baseline 
Former-commit-id: e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: a89221c75b
Former-commit-id: 8123d5ac45
 2013-03-05 10:47:06 -06:00
Steve Harris
9066d511fe 13.3.1-4 baseline 
Former-commit-id: 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 8c0b90f292
Former-commit-id: d79303de13
 2013-03-05 10:39:59 -06:00
Bryan Kowal
b407a34461 Issue #1750 - edexBridge will now set the QPID persistence flag 
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98

Former-commit-id: 8b4dce1c3d [formerly 3a8efd5edf [formerly d466b647d0d810418a88c875f39e55d98d680aa1]]
Former-commit-id: 3a8efd5edf
Former-commit-id: d484acbca0
 2013-03-04 17:58:04 -06:00
Bryan Kowal
18a778cb8c Issue #1739 - fix Wes2Bridge 
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814

Former-commit-id: 86a1f16e37 [formerly 20d3c6bcaa [formerly b74410b2e816686ed9525e3e8a80c17096e6aadb]]
Former-commit-id: 20d3c6bcaa
Former-commit-id: 9022c53d53
 2013-03-01 11:49:09 -06:00
Bryan Kowal
875c17399a 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: 4faf8aefbe [formerly d081a2afcd [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]
Former-commit-id: d081a2afcd
Former-commit-id: f806c880d3
 2013-02-28 18:09:25 -06:00
Bryan Kowal
37e9c0cb20 Issue #1638 - update CAVE rpm name generation 
Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f

Former-commit-id: 5eb888fb98 [formerly b8496877ff [formerly 7cf0100415245ae81fa232e398936fe33a2b1bc3]]
Former-commit-id: b8496877ff
Former-commit-id: a9123a2b84
 2013-02-28 14:43:53 -06:00
Richard Peter
bcd6b4d82b 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: 84e1b2f999 [formerly 6c766ddd85 [formerly d89e15dc9528bfbc67f67cc1d8a2989e7390131d]]
Former-commit-id: 6c766ddd85
Former-commit-id: b354ebb862
 2013-02-27 11:43:18 -06:00
Steve Harris
90b0bab156 Merge branch 'development' into omaha_13.3.1 
Former-commit-id: 6ec9e73035 [formerly 67f090638f [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]
Former-commit-id: 67f090638f
Former-commit-id: 0a4564eb97
 2013-02-25 15:58:48 -06:00
Bryan Kowal
6f419ae22f Issue #1634 - force added wrapper jars in bin directory 
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48

Former-commit-id: d5c8b82941 [formerly 7c62991edf [formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]
Former-commit-id: 7c62991edf
Former-commit-id: 4cd5453e0a
 2013-02-22 09:28:37 -06:00
Steve Harris
abdc733151 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: 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: a0573644c4
Former-commit-id: 64744fdb19
 2013-02-21 15:41:39 -06:00
Bryan Kowal
0d4a63efe4 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: 803397c7c7 [formerly a8fb04f41c [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]
Former-commit-id: a8fb04f41c
Former-commit-id: 519ce2c0fb
 2013-02-21 13:55:28 -06:00
Steve Harris
e0406d3183 13.3.1-1 baseline 
Former-commit-id: d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: 71e8990021
Former-commit-id: 8ae397085e
 2013-02-20 16:19:40 -06:00
Steve Harris
f1f5359a2f Merge branch 'omaha_13.2.1' (13.2.1-8) into development 
Former-commit-id: d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]
Former-commit-id: ea50a5db77
Former-commit-id: c2327ce33d
 2013-02-19 12:22:00 -06:00
Steve Harris
fcef63a7af Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1 
Former-commit-id: 6318348e3b [formerly 1874b07ab4 [formerly c397745e9c36a88bf71d87b671f0a8c826e117ea]]
Former-commit-id: 1874b07ab4
Former-commit-id: b8720e185d
 2013-02-18 09:52:22 -06:00
Steve Harris
0e7cd27efc Issue #1632 - new FOSS licenses added for Data Delivery plugins 
Former-commit-id: b9ce5b8b35 [formerly 02ec634536 [formerly 82d2a8bdfe9a82cce28637153c8cbb169bd1aa5a]]
Former-commit-id: 02ec634536
Former-commit-id: 049c219f2b
 2013-02-18 09:39:31 -06:00
Steve Harris
d176ec1f38 13.2.1-8 baseline 
Former-commit-id: 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: f81b382c04
Former-commit-id: 18da2e93d7
 2013-02-18 09:09:41 -06:00
Bryan Kowal
815ad5b07d 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: 917bc533d6 [formerly 612d4fca1f [formerly 30086ab14cfaab149a689b84803ac906754ddd13]]
Former-commit-id: 612d4fca1f
Former-commit-id: 306842b297
 2013-02-11 15:13:07 -06:00
Richard Peter
1e07d66c7f Merge "Issue #1576 - updated qpid 0.18 rpms" into development 
Former-commit-id: b774fadb60 [formerly 221a6e1ca1 [formerly 16b20a7f05e0a16ef02881a950bd541f7b4a4a1e]]
Former-commit-id: 221a6e1ca1
Former-commit-id: bb317b1acf
 2013-02-05 09:25:55 -06:00
Bryan Kowal
e839188ca1 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: 09523f1e84 [formerly 1678618015 [formerly c43c4268ba13e5758dfb4c504d57dead5ae89d63]]
Former-commit-id: 1678618015
Former-commit-id: 145cd06eae
 2013-02-04 12:31:23 -06:00
Brad Gonzales
7cef72a460 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: 5bc6dd5498 [formerly f459554e33 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]
Former-commit-id: f459554e33
Former-commit-id: 35cc853c74
 2013-02-04 08:52:33 -06:00
Steve Harris
f207d282bc 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: ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]
Former-commit-id: 658bea377b
Former-commit-id: c218786986
 2013-01-31 10:19:14 -06:00
Steve Harris
e6093b159e Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery 
Former-commit-id: 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]
Former-commit-id: 0505ed0a72
Former-commit-id: e655d297f7
 2013-01-29 15:57:21 -06:00
Steve Harris
b84acc06da 13.2.1-3 baseline 
Former-commit-id: 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]
Former-commit-id: f45120a1f4
Former-commit-id: 283147571f
 2013-01-29 15:52:43 -06:00
Bryan Kowal
792230a38e Issue #1537 - fixed the edex-environment build 
Former-commit-id: fa511e980b [formerly 7116bb86ef [formerly 4b9bd72e929e36d5c949589d5cc4ed6648a069ac]]
Former-commit-id: 7116bb86ef
Former-commit-id: a960b34230
 2013-01-29 09:51:54 -06:00
Bryan Kowal
7b4935a0ef Issue #1503 - initial commit for build of Qpid 0.18 rpms 
-created a qpid service script

Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3

Former-commit-id: 54697ff658 [formerly ff34587e94 [formerly ee5806c98eb57680403e4f7768f92af1faa75de4]]
Former-commit-id: ff34587e94
Former-commit-id: ec584b4d4b
 2013-01-28 11:21:24 -06:00
Steve Harris
74bfe9595c 13.2.1-2 baseline 
Former-commit-id: c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: 7a7f7c45ca
Former-commit-id: 0006a2b6cb
 2013-01-25 09:07:12 -06:00
Steve Harris
7d2e979c51 13.2.1-3 baseline 
Former-commit-id: 2b6ac028bd [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]
Former-commit-id: 7435527b25
Former-commit-id: a5a0da5c02
 2013-01-23 11:24:17 -05:00
Steve Harris
a4fa438a41 13.2.1-2 baseline 
Former-commit-id: 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 83e9157df7
Former-commit-id: 33bc5fd816
 2013-01-23 11:18:44 -05:00
Steve Harris
11b05eedeb 13.2.1-1 baseline 
Former-commit-id: c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: 9771dfae6b
Former-commit-id: 48d1aa7732
 2013-01-23 11:13:03 -05:00