Bryan Kowal
d7fba83690
Issue #1835 - update LDM to 6.11.2
...
- fixed hard-coded 6.8.1 version
Change-Id: Id201ea8703dd67e3b7aaadd9787fa97be2da8890
Former-commit-id: ba3a0ad7d5
[formerly 890a6c0afb
[formerly 72ffc3204a1fa40fe2ae17801013cb93cd2961b8]]
Former-commit-id: 890a6c0afb
Former-commit-id: dfd75571f3
2013-04-16 16:32:58 -05:00
Mike Duff
bc8ea0c031
Issue #1786 - fix null pointer
...
Change-Id: Ie7bf3aa9afe6a8dcd9d288afc0e6dc537fdf043d
Former-commit-id: 7701902083
[formerly 6b909c7902
[formerly 6f14dfd04a696c71e2b2c9d12b86549287e7f0de]]
Former-commit-id: 6b909c7902
Former-commit-id: ad08e0a6ac
2013-04-16 14:21:28 -05:00
Richard Peter
244e7ab8da
Merge "Issue #1787 Fixed to support changes to D2D grid location" into omaha_13.4.1
...
Former-commit-id: 5a11d3cc1c
[formerly 390bf03c39
[formerly 73e3a04a98ced3670c61b5debacdfc79d494ab29]]
Former-commit-id: 390bf03c39
Former-commit-id: 30e77171ab
2013-04-16 09:35:12 -05:00
Ron Anderson
f0e2bf8755
Issue #1787 Fixed to support changes to D2D grid location
...
Change-Id: I9ba8a45cf5b4f1ada6eaf1390f922bc5560d6e5c
Former-commit-id: 4cd87f2726
[formerly c233ce042d
[formerly 5a15d9add4f47cb2016bbd453008039cef8f765f]]
Former-commit-id: c233ce042d
Former-commit-id: 4ea01a29ce
2013-04-15 18:02:47 -05:00
Dave Hladky
bb6814beef
Issue #1890 moved date keys to references in FFMPRecord instead of hard object in FFMPBasin
...
Change-Id: I840e0805422686856744f0d39dda0aeac4755bb8
Former-commit-id: 978e68d893
[formerly 60fa768195
[formerly 4c1e41a6a77ea89f2a0c0253671b8d6cca071c04]]
Former-commit-id: 60fa768195
Former-commit-id: c52445652a
2013-04-15 17:58:06 -05:00
Bryan Kowal
715befa75c
Issue #1814 - use the AWIPS II log4j.xml for qpid
...
Change-Id: I99b34003e81686c2794acc8d3567189dc8c3b3d1
Former-commit-id: 35b956fc4c
[formerly e00a6207a5
[formerly b7297cb67055cafdef19595e0e0a481a33a9552e]]
Former-commit-id: e00a6207a5
Former-commit-id: e720bf74b5
2013-04-15 16:38:00 -05:00
Lee Venable
c23b6d31d5
Merge "Issue #1902 - FFMP permormance/cleanup peer review comments" into omaha_13.4.1
...
Former-commit-id: 8c8709f4a6
[formerly 8723d88a19
[formerly 042819679ba8e0d22695b41059772da841619f29]]
Former-commit-id: 8723d88a19
Former-commit-id: 9ae56e2172
2013-04-15 15:33:53 -05:00
Richard Peter
81749b9af5
Issue #1814 : Change baseline memory configuration and baseline default log configuration
...
Change-Id: I83969cb5ff2962fe293b8cfee02c4b7c4108f2c3
Former-commit-id: 78b230aaaf
[formerly 0c869ee231
[formerly 6ce6d876a153a6fe0fd1c4939dae8b719ec470e3]]
Former-commit-id: 0c869ee231
Former-commit-id: c10d2f7520
2013-04-15 12:52:40 -05:00
Mike Duff
dc8e37c0df
Issue #1902 - FFMP permormance/cleanup
...
peer review comments
Change-Id: Id0c238906a1189c9c88e3dc99aa0a60cbfa00a15
Former-commit-id: 85f1aba297
[formerly 020713663a
[formerly 15b28d081af503387ed1c350f4ec23258c41d68f]]
Former-commit-id: 020713663a
Former-commit-id: 8271eaf328
2013-04-15 09:40:07 -05:00
Steve Harris
bc46b3803f
Merge branch 'master_13.3.1' into omaha_13.4.1
...
Former-commit-id: bdefa9f20f
[formerly 6dc19411c1
[formerly cb0c44c44331d64e566905a166abf132f6a5817b]]
Former-commit-id: 6dc19411c1
Former-commit-id: 97790b0d3e
2013-04-15 09:37:29 -05:00
Steve Harris
9e73c3f1ed
13.3.1-20 baseline
...
Former-commit-id: 446bec6f49
[formerly 25432cc388
[formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]]
Former-commit-id: 25432cc388
Former-commit-id: 07f7e6e2b4
2013-04-15 08:58:59 -05:00
Ron Anderson
e129ae4a36
Merge "Issue #1845 : Fix gfeNotify with java qpid broker" into omaha_13.4.1
...
Former-commit-id: 428fdebd9e
[formerly df06966a09
[formerly f23561f863b623b230b19ef2075560507fc61fb6]]
Former-commit-id: df06966a09
Former-commit-id: 4e62fbdd54
2013-04-15 08:27:42 -05:00
Nate Jensen
d3517fbb70
Merge "Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil." into omaha_13.4.1
...
Former-commit-id: a422709ab6
[formerly b24ccfd7a3
[formerly bc12d9c818b72ae16c485a33719817bd15301bca]]
Former-commit-id: b24ccfd7a3
Former-commit-id: ea2c0e6c40
2013-04-12 12:39:12 -05:00
Richard Peter
efe0dce3ed
Issue #1845 : Fix gfeNotify with java qpid broker
...
Change-Id: I792b4598a296dcd7a8bafbd89c184dc709fdc193
Former-commit-id: a6ffc663a9
[formerly 025600f4cb
[formerly 9f3806e9579cef66d0a40a290d9d36a089f2b3d6]]
Former-commit-id: 025600f4cb
Former-commit-id: 4e3e044281
2013-04-12 12:04:54 -05:00
Roger Ferrel
04ab641171
Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil.
...
Change-Id: Iaa88a15c0406bf5b0c9ffeb5af7f31701be226a9
Former-commit-id: 4c15be46a0
[formerly 842852d975
[formerly 7cf9c217010a260281480eccdcc4e0b8d83fcd1f]]
Former-commit-id: 842852d975
Former-commit-id: 1258e12e11
2013-04-12 11:10:13 -05:00
Bryan Kowal
45b8575578
Issue #1901 - EDEX will no longer automatically be killed during shutdown
...
Former-commit-id: 81423bdca1
[formerly 36fa6f932b
[formerly 5b6452684b4a64620586e265f54dbcfa15c974ff]]
Former-commit-id: 36fa6f932b
Former-commit-id: fabebb7adf
2013-04-12 10:36:15 -05:00
David Gillingham
a3003e5e07
Issue #1898 : Modify service backup export_configuration script to also include site's map bundles.
...
Former-commit-id: 7303425900
[formerly d5c8ecc6d3
[formerly d197bc7fef0ca97f533d5270625b5e696ab29dca]]
Former-commit-id: d5c8ecc6d3
Former-commit-id: 967ec40df6
2013-04-12 09:50:47 -05:00
Bryan Kowal
ea560bc843
Issue #1897 - updated from PostgreSQL 9.2.3 to PostgreSQL 9.2.4
...
Former-commit-id: 765569f139
[formerly 331ca69086
[formerly 64f31d1f7c2c01eee91cfb4de68fbc01a73ae113]]
Former-commit-id: 331ca69086
Former-commit-id: cc0748d2d9
2013-04-11 18:06:42 -05:00
Steve Harris
58848dbf11
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: 0fed14d765
[formerly 55d9909d6d
[formerly 6dced3d81d2733f9f7c5f3d54cb123bf8ba055b2]]
Former-commit-id: 55d9909d6d
Former-commit-id: 0d86b95f1b
2013-04-11 13:14:00 -05:00
Steve Harris
7447270b78
Issue #1862 - Tarfile part of: set_hydro_env now looks up db driver
...
Former-commit-id: bb0ad5b16a
[formerly 1de937229f
[formerly ac202b9d79c530276e92a3e98ce097a8d1a620f2]]
Former-commit-id: 1de937229f
Former-commit-id: f95c1746fe
2013-04-11 12:49:31 -05:00
Lee Venable
ad4ef907c9
Merge "Issue #1862 - set_hydro_env now looks up db driver jar dynamically Peer review comments" into omaha_13.4.1
...
Former-commit-id: 04713029bf
[formerly df3a446c96
[formerly de28fa98b53242155213b7c66b54fe146166816d]]
Former-commit-id: df3a446c96
Former-commit-id: d1640829b9
2013-04-11 12:14:04 -05:00
Mike Duff
f11f5487a9
Issue #1862 - set_hydro_env now looks up db driver jar dynamically
...
Peer review comments
Change-Id: I6904da96e89930b6efa802ec6302cc7a7d36a3d9
Former-commit-id: 13542f3d70
[formerly d981d74087
[formerly c58285e63aa18eca991ebce3c408a298b09efe8c]]
Former-commit-id: d981d74087
Former-commit-id: 07ab20ccfe
2013-04-11 12:12:58 -05:00
Dave Hladky
dc91e88853
Issue #1886 double pfaf in mouseover text
...
Change-Id: I4f89aede6985126cfda5491b6df5bc4e18f34362
Former-commit-id: 53fbf8815e
[formerly 7c1e2eddbc
[formerly e1d484049e276877ef4327b5fbd8d722e1eda20c]]
Former-commit-id: 7c1e2eddbc
Former-commit-id: ed0afbec22
2013-04-11 09:06:03 -05:00
Bryan Kowal
a24885cb34
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: a792a0246b
[formerly cce4b819c9
[formerly 655d6f29a5f9667dad6900a6dc2562968d8c8fcb]]
Former-commit-id: cce4b819c9
Former-commit-id: 8e78666902
2013-04-10 18:29:52 -05:00
Bryan Kowal
a05a76ddc7
Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
...
Former-commit-id: ef5dcf4489
[formerly c28286b9ef
[formerly f49bb80458be42996555e5692a3403f2befad77b]]
Former-commit-id: c28286b9ef
Former-commit-id: b4f51b7c46
2013-04-10 18:27:52 -05:00
Richard Peter
6a4fc2bd2d
Merge "Issue #1805 - incremented the python qpid release" into omaha_13.4.1
...
Former-commit-id: 3fe70ff22c
[formerly d8a0b43df2
[formerly ac8837195f4861988b39062b252e7e3fb7133ed5]]
Former-commit-id: d8a0b43df2
Former-commit-id: 8ce7032f07
2013-04-10 16:58:17 -05:00
Richard Peter
7816a9baa7
Merge "Issue #1874 - created external properties files for specifying the number of grib decode threads" into omaha_13.4.1
...
Former-commit-id: 7f25a86e4d
[formerly a244fe0cd0
[formerly cd417d34a230322f80dd48eb59416c938697320d]]
Former-commit-id: a244fe0cd0
Former-commit-id: b29d274316
2013-04-10 16:57:38 -05:00
Bryan Kowal
7dab615cd8
Issue #1805 - incremented the python qpid release
...
Former-commit-id: 2bfd416f13
[formerly c146f1835b
[formerly f2c5c819d91ad851d82444865b4279f85e13f791]]
Former-commit-id: c146f1835b
Former-commit-id: 12d16daeed
2013-04-10 16:49:20 -05:00
Bryan Kowal
d1799b4e0f
Issue #1874 - created external properties files for specifying the number of grib decode threads
...
- there is now one property for the number of threads
- the property is now used to set the number of concurrent consumers
Change-Id: I5e0c39928d1f3b92ad2875e6b720c9dde1b779ff
Former-commit-id: b5994702dc
[formerly eb04d2b85f
[formerly deeab1e1074fec2d62e55760d9fe45ec7379b9f8]]
Former-commit-id: eb04d2b85f
Former-commit-id: 4ef22f8e93
2013-04-10 16:24:39 -05:00
Ron Anderson
d0124941cf
Issue #1854 Fix for compatibility with PostGIS 2.0
...
Change-Id: I5b6ff34c823302b8db466d8e27130904bf4b82c3
Former-commit-id: fcacf03de0
[formerly dd10f6799b
[formerly 06158e2d3486770e0aeda370f12e49356d15d440]]
Former-commit-id: dd10f6799b
Former-commit-id: f8a20529d7
2013-04-10 15:57:05 -05:00
Nate Jensen
f02d3d2d67
Merge "Issue #1896 Make FFMPResource work better with D2D time matcher." into omaha_13.4.1
...
Former-commit-id: e6c7729470
[formerly 2e6f8d874e
[formerly db2d869900335634e9976370b7154baad4415ab2]]
Former-commit-id: 2e6f8d874e
Former-commit-id: 1825e7a4fc
2013-04-10 14:57:43 -05:00
Richard Peter
64f626df2f
Merge "Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean" into omaha_13.4.1
...
Former-commit-id: a31dec3cc8
[formerly 060cf5b326
[formerly 203a91a2d673329199e9fecc8bf2f171bd524cc2]]
Former-commit-id: 060cf5b326
Former-commit-id: 429d562563
2013-04-10 14:40:36 -05:00
Nate Jensen
443b6cc400
Merge "Issue #1786 - Initial checkin of https for thin client Code review comments" into omaha_13.4.1
...
Former-commit-id: f59a8b3d4c
[formerly 7ca6107be4
[formerly b4e2ee48a9ce2f5d751a2b18c0c945f51c162324]]
Former-commit-id: 7ca6107be4
Former-commit-id: c291c9a61d
2013-04-10 14:35:06 -05:00
Ben Steffensmeier
c328c1ad8d
Issue #1896 Make FFMPResource work better with D2D time matcher.
...
Former-commit-id: f58e1fe7b4
[formerly 6637ae7c0e
[formerly 8253598d2f19321c86a1d2da2a6b634a5ae7cd31]]
Former-commit-id: 6637ae7c0e
Former-commit-id: 2fc12b739b
2013-04-10 14:30:50 -05:00
Ben Steffensmeier
aa7aa88ee5
Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean
...
Former-commit-id: d0070fcec4
[formerly d727b93273
[formerly f9eb42deebaab88fb9f1bbee54537e62acdc72fa]]
Former-commit-id: d727b93273
Former-commit-id: 26b8938242
2013-04-10 14:09:47 -05:00
Mike Duff
60a6fb451c
Issue #1786 - Initial checkin of https for thin client
...
Code review comments
Change-Id: I1fde9a276ecca44d87603be08a99232a5d7b441e
Former-commit-id: 0a33734e6f
[formerly b9abbcdf37
[formerly 6f206dad8ffbbd7b793b92b8a23bbce74a5b0017]]
Former-commit-id: b9abbcdf37
Former-commit-id: f584e17aa7
2013-04-10 10:29:33 -05:00
Bryan Kowal
7c16aacfb0
Issue #1844 - declare table headers before sorting the table rows in qpid-queue-count.
...
Former-commit-id: b956f09b37
[formerly da7371618c
[formerly 4f86b9cf6cf5e586199a08d2a470e232b1a8da1e]]
Former-commit-id: da7371618c
Former-commit-id: 71b443b525
2013-04-09 16:09:40 -05:00
Bryan Kowal
843fd4bbbc
Issue #1844 - updated the description for the "-s" argument in the usage message.
...
Former-commit-id: e841aa070d
[formerly 42542eb9bb
[formerly 87c038167dae3c211ec01615c007df24ae355704]]
Former-commit-id: 42542eb9bb
Former-commit-id: 214a9207ba
2013-04-09 15:45:40 -05:00
Bryan Kowal
df07748ab8
Issue #1844 - update qpid-queue-count and qpid-stat to use the new REST-based ws
...
- removed debug print statements
- currently, authenticating against the REST service is not supported; need to
setup a qpid that requires REST authentication to ensure proper implementation
Change-Id: I9790f7a6678f30892ee3e5a29bcc8f2b5606b478
Former-commit-id: 6811a31cd5
[formerly e5ee38d896
[formerly a45c818e6df529fb4e85f76cd5155a48c67fe0d9]]
Former-commit-id: e5ee38d896
Former-commit-id: 9aab25bdd4
2013-04-09 14:21:09 -05:00
Bryan Kowal
1c225c3ad7
Issue #1805 - restore the full nightly delta build.
...
Former-commit-id: 837a65494f
[formerly 6beda99aee
[formerly a0a625006c1fec5c6825e390b1dfd1e539ca318c]]
Former-commit-id: 6beda99aee
Former-commit-id: 4c3dfc910c
2013-04-09 09:56:38 -05:00
Steve Harris
196767d525
13.3.1-19 baseline
...
Former-commit-id: abaf9f12f9
[formerly 9be238bcc4
[formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]
Former-commit-id: 9be238bcc4
Former-commit-id: dc9fef33a9
2013-04-09 08:37:12 -05:00
Richard Peter
9cdbdbfd33
Merge "Issue #1293 - remove hdffileid and create delta script to update existing databases" into omaha_13.4.1
...
Former-commit-id: e95911f615
[formerly aba25dc7c4
[formerly ecf4556f6bf0b1ca13013a0f5143a0f840218a13]]
Former-commit-id: aba25dc7c4
Former-commit-id: 0abecda3d1
2013-04-08 14:20:09 -05:00
Bryan Kowal
885dd56459
Issue #1293 - remove hdffileid and create delta script to update existing databases
...
- now in the 13.4.1 branch
Former-commit-id: c08190a586
[formerly 4cc9a742c8
[formerly f58fa2c5360cdbf38580bb675d2acdc8cb6b438e]]
Former-commit-id: 4cc9a742c8
Former-commit-id: e92e2712da
2013-04-08 14:04:05 -05:00
Steve Harris
7266d7a21b
Issue #1872 - added the edexOsgi/build.edex/esb/bin/yajsw/ content for rpm builds
...
Former-commit-id: 84370207a1
[formerly 53492c2902
[formerly da94d1f4ffc37edd53f17118c0b4420dd6500099]]
Former-commit-id: 53492c2902
Former-commit-id: 2711be871a
2013-04-08 13:47:34 -05:00
Greg Armendariz
bde00389a1
Issue #1872 - Add Jensen's build fix
...
Former-commit-id: 0e2b440b86
[formerly fba9de785d
[formerly ea5a1fa7de2acd53dcdb510ed42326153857a146]]
Former-commit-id: fba9de785d
Former-commit-id: 8b2d3f7b00
2013-04-08 12:26:20 -05:00
Bryan Kowal
18a90e6bca
Issue #1873 - reduce EDEX shutdown time
...
Former-commit-id: 82a1b0752e
[formerly bec051d00a
[formerly 954e71e2a22252cf62041be5ee0c5de7f1418298]]
Former-commit-id: bec051d00a
Former-commit-id: b252ca6506
2013-04-04 17:36:09 -05:00
Dustin Johnson
ff6f1dc67a
Issue #1872 Fix compile errors
...
Change-Id: Ic70a61c30bbe8ff4768a8079beb5be5f9336876a
Former-commit-id: 06e6d84273
[formerly 7cf482512d
[formerly 2b84d1a58c99858784294bf32b293f8a54c38ecd]]
Former-commit-id: 7cf482512d
Former-commit-id: ec85cdcf8c
2013-04-04 16:44:57 -05:00
Roger Ferrel
50ffd4082b
Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
...
Change reviewer comments.
Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d
Former-commit-id: b00d64ec0a
[formerly 998714524d
[formerly 882f96509c19f0621a4f6e6806e3177f6c566562]]
Former-commit-id: 998714524d
Former-commit-id: 90dae591a6
2013-04-04 13:22:10 -05:00
Max Schenkelberg
a5994b8983
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
...
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Conflicts:
cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java
Former-commit-id: b042037a67
[formerly 6d0960c4ef
[formerly ed981dc2487d169a502f7396520899fc55ff3299]]
Former-commit-id: 6d0960c4ef
Former-commit-id: be574276f9
2013-04-04 13:21:35 -05:00
Mike Duff
b96f951732
Issue #1830 - Don't allow base level config files for FFMP
...
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: 15c4f53172
[formerly 42fa10a859
[formerly 33f7392176acf8da158f309451557edd677c7805]]
Former-commit-id: 42fa10a859
Former-commit-id: 57146e3c95
2013-04-04 13:20:28 -05:00