Bryan Kowal
b5a50b9c2a
Issue #1805 - adding missing qpid changeset to 13.4
...
- 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
- merged specs patch file
Change-Id: I8172800bfbc31be7117c490e828ebfc1e2355774
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
Former-commit-id: 2ec2c5abd51f868d391fd7b463f6a4f3dfe43098d7b463f6a4f3dfe43098fd40278c7129d65b3161
2013-04-24 13:44:49 -05:00
Bryan Kowal
dab043196b
Issue #1938 - ncep database specification updates
...
- update ncep database specification for compatibility with 13.1+ AWIPS II RPMs
- verify that ncep database is compatible with PostgreSQL 9
- ncep database rpm will now be built during a full 32-bit or 64-bit build
- ncep database is now a noarch rpm like the other AWIPS II database rpms
- Amend: use the AWIPS II data directory variable
Change-Id: Ifa0e0816b6f584fa8b19d36f80c3e5d4282288d3
Former-commit-id: ead996bc07b13ac1b64658989f191fdafd703b2f58989f191fdafd703b2f3277122f2556ce730907
2013-04-24 12:45:17 -05:00
Bryan Kowal
86c3608556
Issue #1938 - install the postgis legacy functions for the metadata and maps database during installation.
...
- accept DR for work
Change-Id: Ib19064e3a1ea446b3325979d816924a0f1a45b63
Former-commit-id: d952acce9eb3974dfe6287d0aa17a099d74e39ea87d0aa17a099d74e39ea4dedf0b1eb5018b12ec6
2013-04-23 12:02:01 -05:00
Bryan Kowal
f34b13ea1d
Issue #1835 - updates to the ldm rpm specification
...
- su "-lc" will now be used when executing the commands to build ldm
- the ldm rpm will now create its own /usr/local/ldm link
- Amend: removed registry.xml, ldmadmin-pl.conf, *.tbl from the source tar
- Amend: create .bash_profile during installation
- Amend: archive any existing ldm directories before creating the link
Change-Id: I00ebf8e621e66ddc4270ecfb44801cac7a9315b5
Former-commit-id: 9cd730277894affd80a01fda784c0ca6e4df10411fda784c0ca6e4df104106c21f9828e1cb97383f
2013-04-22 15:31:54 -05:00
Nate Jensen
ba4b90feac
Merge "Issue #1915 - updated Linux java to 6u43." into omaha_13.4.1
...
Former-commit-id: ed0fe7cd3e2c7a8b0d157fbc2427cf57ccac05e87fbc2427cf57ccac05e809edb866f3cba0db0c3a
2013-04-22 09:13:28 -05:00
Greg Armendariz
3b9d87dd82
Merge "Issue #1835 - minor updates to the ldm specification" into omaha_13.4.1
...
Former-commit-id: 35588c5cdb0cd81b855f96877d71ff5a4a2dea7296877d71ff5a4a2dea7233a7a2cdb33f5af9ead4
2013-04-19 10:42:29 -05:00
Bryan Kowal
653013f6a1
Issue #1927 - fixed CAVE rpm dependency determination
...
Former-commit-id: 9409fd486df78a58c6be79e22d6770988fbfc8ad79e22d6770988fbfc8adc30292262a9423b26507
2013-04-19 08:36:10 -05:00
Bryan Kowal
93f2f81ec0
Issue #1805 - edex-environment will now use the 13.4.1 path to access the EDEX service script.
...
Change-Id: Idc3a9c692faf76ea81ba3d994e949f3fcb8416ca
Former-commit-id: 5b5651ecf5f7eca8672c7c0f1eb0f7c02a38d7f27c0f1eb0f7c02a38d7f2e6c490852b3838fc2e43
2013-04-19 06:55:00 -05:00
Bryan Kowal
9371c54897
Issue #1915 - updated Linux java to 6u43.
...
Change-Id: I39bdb6bbb0cc23c457ddb08ba151ce0b707ff3e7
Former-commit-id: e35586ce188caf7c9404c0227ea66d633b89da12c0227ea66d633b89da12a2200c574202c0ea7d8b
2013-04-18 23:51:54 -05:00
Bryan Kowal
6b02bf4333
Issue #1835 - minor updates to the ldm specification
...
- the ldm rpm will now print error descriptions when the installation fails
- declared a depdency on zlib which is required to build noaaport
Former-commit-id: 2d813c653fc305833e551c40009549744f37dd961c40009549744f37dd9646fe3aee32db4e03f80e
2013-04-18 16:18:57 -05:00
Bryan Kowal
68244041e7
Issue #1899 - edex-environment is now compatible with qpid 0.18.
...
- added change history
Change-Id: Ie6a47ed2413a366f1475d2be848ea05569c4e646
Former-commit-id: 04c1bca94664d9276e2e0924bfd72686d8e511b50924bfd72686d8e511b5ff64a23debcf71d24fff
2013-04-18 14:06:53 -05:00
Bryan Kowal
6e93716097
Issue #1835 - update LDM to 6.11.2
...
- fixed hard-coded 6.8.1 version
Change-Id: Id201ea8703dd67e3b7aaadd9787fa97be2da8890
Former-commit-id: d7fba83690dfd75571f3890a6c0afbba3a0ad7d5890a6c0afbba3a0ad7d56ef61185c9fc4e0af835
2013-04-16 16:32:58 -05:00
Bryan Kowal
02f01470fc
Issue #1814 - use the AWIPS II log4j.xml for qpid
...
Change-Id: I99b34003e81686c2794acc8d3567189dc8c3b3d1
Former-commit-id: 715befa75ce720bf74b5e00a6207a535b956fc4ce00a6207a535b956fc4ccbc274207049b9046bb4
2013-04-15 16:38:00 -05:00
Richard Peter
227dcdbd81
Issue #1814 : Change baseline memory configuration and baseline default log configuration
...
Change-Id: I83969cb5ff2962fe293b8cfee02c4b7c4108f2c3
Former-commit-id: 81749b9af5c10d2f75200c869ee23178b230aaaf0c869ee23178b230aaafd967301cfca281d26608
2013-04-15 12:52:40 -05:00
Bryan Kowal
763c9b7ca1
Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
...
Former-commit-id: 52f1aa5fda0800c14061cca3f43736c797715efecca3f43736c797715efe671e600a628e27924557
2013-04-15 09:40:43 -05:00
Bryan Kowal
cb1af6d7dd
Issue #1897 - updated from PostgreSQL 9.2.3 to PostgreSQL 9.2.4
...
Former-commit-id: ea560bc843cc0748d2d9331ca69086765569f139331ca69086765569f13973e3d99f472fca1ce506
2013-04-11 18:06:42 -05:00
Steve Harris
6f691692bb
Issue #1872 - Merge branch 'master_13.3.1' (13.3.1-19) into omaha_13.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
Former-commit-id: 58848dbf110d86b95f1b55d9909d6d0fed14d76555d9909d6d0fed14d765fe6a078c6455dda49d47
2013-04-11 13:14:00 -05:00
Bryan Kowal
29022ce97c
Merge "Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades." into omaha_13.4.1
...
Former-commit-id: a24885cb348e78666902cce4b819c9a792a0246bcce4b819c9a792a0246b7f482f0335893074643b
2013-04-10 18:29:52 -05:00
Bryan Kowal
1febd44526
Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
...
Former-commit-id: a05a76ddc7b4f51b7c46c28286b9efef5dcf4489c28286b9efef5dcf44893baf4ada50cfba1ca4a1
2013-04-10 18:27:52 -05:00
Bryan Kowal
3d7a62e041
Issue #1805 - incremented the python qpid release
...
Former-commit-id: 7dab615cd812d16daeedc146f1835b2bfd416f13c146f1835b2bfd416f136c7cad26f01ac1d10e40
2013-04-10 16:49:20 -05:00
Bryan Kowal
d0c3abc675
Issue #1805 - restore the full nightly delta build.
...
Former-commit-id: 1c225c3ad74c3dfc910c6beda99aee837a65494f6beda99aee837a65494fa4d8303e2d0da297e3bc
2013-04-09 09:56:38 -05:00
Steve Harris
fe5020d315
13.3.1-19 baseline
...
Former-commit-id: 196767d525dc9fef33a99be238bcc4abaf9f12f99be238bcc4abaf9f12f9340a2cfb23ed4150db5f
2013-04-09 08:37:12 -05:00
Bryan Kowal
a5d79669d7
Issue #1805 - restore the full nightly delta build.
...
Former-commit-id: 84742433601ebf50c7ed52be309cacdc522ede4452be309cacdc522ede4404e22df174607d5b205d
2013-04-04 16:16:53 -05:00
Bryan Kowal
c9666aa999
Issue #1750 - qpid updates for compatibility with operational servers
...
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes
Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
Former-commit-id: dd911d33bc7af4c80bab1000dac7ad1cea2404c81000dac7ad1cea2404c822a2c082b88c20b1f4bc
2013-04-04 13:20:13 -05:00
Bryan Kowal
5cb707736a
Issue #1750 - include the qpidd service script in the rpm installations
...
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de
Former-commit-id: 52fc0c66c20d252800eea07f8076cf3454fd030ba07f8076cf3454fd030b3dadeb157d59b2e35928
2013-04-04 13:12:07 -05:00
Richard Peter
d1369dbf29
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: 1d7d360f2c91d708eaacf77948929d814bff6ddbf77948929d814bff6ddb4337abd873e9fe732dac
2013-04-04 13:03:41 -05:00
Bryan Kowal
ef26170029
Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
...
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694
Former-commit-id: 978f55d0078c68c8f9cbbfb14b4ad624dd9b550dbfb14b4ad624dd9b550d122c085a620a801c95ce
2013-04-04 13:03:20 -05:00
Bryan Kowal
1147a05bcf
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: ce08162045991de38661a8d4e8f6ec3d04b0f87ba8d4e8f6ec3d04b0f87ba154e3b3cda214ee536a
2013-04-04 13:03:08 -05:00
Bryan Kowal
d6b11bacf0
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: 321660e016211307edfd9e99447eee4fd4786ae59e99447eee4fd4786ae5fcc7b102add40863c38f
2013-04-04 12:56:58 -05:00
Bryan Kowal
9041cb18ca
Issue #1750 - edexBridge will now set the QPID persistence flag
...
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98
Conflicts:
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: bc227a5cb96f8ef422c8d585db3b991e3e6e3f28d585db3b991e3e6e3f28fdf99a56b245ee1fd607
2013-04-04 12:37:15 -05:00
Steve Harris
bbfc0f76ef
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 4dfea33cdd9879b94de98b607f82285c9a6b83cc8b607f82285c9a6b83cced8c0487fe0f53c46d7a
2013-04-04 11:58:50 -05:00
Steve Harris
b2de6fd4c1
Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
...
Former-commit-id: 77c0dd0b552bc12f7a230f000f4485327d05f3b50f000f4485327d05f3b5c7b96904560342b648b6
2013-04-03 15:52:19 -05:00
Steve Harris
a196ebc11b
13.3.1-18 baseline
...
Former-commit-id: e621424fcbf3e79bcc9da2b098d86dce6a06a7e3a2b098d86dce6a06a7e3bf6c3b67620edd049e3b
2013-04-03 14:58:29 -05:00
Bryan Kowal
55b84c59c6
Issue #1850 - the ebxml schema will now be created within the metadata database
...
Former-commit-id: 3d13334576d6e3d521268d63244b4e2dbd62e9ce8d63244b4e2dbd62e9ceb31ade0770a57a457c79
2013-04-02 10:49:46 -05:00
Steve Harris
47c7f66f2b
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 5ec1c01d3a736bb45741140765a43e437a04011a140765a43e437a04011a0b48e963147b27767d7e
2013-04-01 12:19:04 -05:00
Steve Harris
12055591ea
Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
...
Conflicts:
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Former-commit-id: d2d91959253b722f107674a47b9bd914c9de225974a47b9bd914c9de2259a6dd28cc82f85a1ab9ab
2013-04-01 12:15:04 -05:00
Steve Harris
a6ff543f88
13.3.1-17 baseline
...
Former-commit-id: 1b8e623c9bf28b85d42f7bf9966dcba3fe998f8f7bf9966dcba3fe998f8f4afa41d4e7ef413da5f7
2013-04-01 12:04:56 -05:00
Bryan Kowal
0e463b7bc9
Issue #1750 - qpid updates for compatibility with operational servers
...
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes
Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f
Former-commit-id: a9cdcfeb64d124f7a37f2819e8fe48e3c39b9be62819e8fe48e3c39b9be607a52630a7fa5825b0c5
2013-03-28 16:00:27 -05:00
Bryan Kowal
cf87439189
Issue #1821 - re-compile grib2.so 32-bit and 64-bit
...
Former-commit-id: d3a2525705203a3d5200da997276252da2b370dbda997276252da2b370db998fbe8769131e260337
2013-03-28 09:48:27 -05:00
Steve Harris
b7beed13a5
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 02f49bc2e4069ee8a7489a321b6ac83073951b3d9a321b6ac83073951b3da4bf236cc76e48567370
2013-03-27 22:16:15 -05:00
Steve Harris
3f99eed860
Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Change-Id: I6b2513155d566aa09571c280b46cf309028a9861
Former-commit-id: bb88c2133a979d6a5d8c2a0e399dc8d997aeaee42a0e399dc8d997aeaee4e67b16bb03428ec8a472
2013-03-27 18:21:05 -05:00
Steve Harris
3cbf22bd96
13.3.1-14 baseline
...
Former-commit-id: f9b343048591a5e4578e9022c500ce9fba973fd09022c500ce9fba973fd02ca160caf0936e4adda2
2013-03-27 17:59:34 -05:00
Roger Ferrel
dea028c7fc
Issue #1828 Fix intlsigmets and text pattern.
...
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0
Former-commit-id: df2a9d8f966a4bd66abc19074d305374389834de19074d305374389834de4c5aa321697244b4d23c
2013-03-26 14:47:48 -05:00
Steve Harris
6e4b9a6f01
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: 690f4517464e54025fcd5fcfaf436065df96a4195fcfaf436065df96a419346b97a39a5bb29627dc
2013-03-26 12:47:40 -05:00
Steve Harris
072b1bf35e
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 8d1903034b85104939ace71c69c3839ff8a94193e71c69c3839ff8a94193b926ff60b302147470db
2013-03-26 12:44:24 -05:00
Steve Harris
b49c1b0fa8
13.3.1-13 baseline
...
Former-commit-id: 0f2ebb8f10792171756fc77a452f5ac65f3e68e5c77a452f5ac65f3e68e5822d05a7094f2e9aec0d
2013-03-26 12:43:07 -05:00
Bryan Kowal
154bedca1d
Issue #1750 - include the qpidd service script in the rpm installations
...
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de
Former-commit-id: 41f03aaf7d233f2c54bec3936dd50e21fa510eaac3936dd50e21fa510eaadb39a45c88f8fafc8d4a
2013-03-25 16:52:33 -05:00
Steve Harris
bb30a41300
13.3.1-12 baseline
...
Former-commit-id: 6f374b35d0be962822070be473728aaaac0b51e50be473728aaaac0b51e5bc439aee4ff80f98cee2
2013-03-25 13:27:13 -05:00
Richard Peter
fced329e1c
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: d6a8b05c22ead48007cb9fdeb37a484c3fcf3b679fdeb37a484c3fcf3b67704bc86cf54b386ccd1c
2013-03-21 18:21:53 -05:00
Greg Armendariz
8550ade3ba
Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
...
Former-commit-id: 65d6bc8cd71e1aea8a406af1a22e5685113a66b66af1a22e5685113a66b6ccabddace61884b6dce3
2013-03-21 12:55:59 -05:00
