David Gillingham
d8dd50f2ba
Issue #1759 : Convert ifpnetCDF and iscMosaic to use more robust request
...
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.
Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152
Former-commit-id: 87013aad89
[formerly 7c74510723
] [formerly 566927980a
[formerly edaef1edf93ed7d7f626591ecfd86fb4c76f92e8]]
Former-commit-id: 566927980a
Former-commit-id: 90b8c80837
2013-03-13 17:14:59 -05:00
Ben Steffensmeier
f5680beaa9
Issue #1791 Implement bulk getGrids to improve performance.
...
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: 37bae0988b
[formerly 4c150b0fd6
] [formerly 89eb902284
[formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]
Former-commit-id: 89eb902284
Former-commit-id: 7abf3cfb39
2013-03-13 17:09:20 -05:00
Nate Jensen
15b3d5add6
Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
...
Former-commit-id: d0db96df45
[formerly dbd2729336
] [formerly eaef235e8e
[formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]]
Former-commit-id: eaef235e8e
Former-commit-id: d881ab1442
2013-03-13 16:17:44 -05:00
Bryan Kowal
f6139755a5
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: db02ab18ed
[formerly 729bc9c4bb
] [formerly 5e86ef080e
[formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]
Former-commit-id: 5e86ef080e
Former-commit-id: 58e035a024
2013-03-13 14:44:05 -05:00
Dave Hladky
9e97fc9efe
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 765be278bb
[formerly 38b952a220
] [formerly 5dc454c7ef
[formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
2013-03-13 13:56:33 -05:00
Ben Steffensmeier
a1ca2ae2d7
Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
...
Former-commit-id: 51955a719a
[formerly 36b3c16a42
] [formerly ddf2092bde
[formerly 9491a90efdb389372e3ff3c988eb19aac9d508b6]]
Former-commit-id: ddf2092bde
Former-commit-id: 247c9f6c1f
2013-03-13 13:21:16 -05:00
Steve Harris
ed5f1dbab6
13.3.1-7 baseline
...
Former-commit-id: 97d2f521e4
[formerly a72254cc75
] [formerly e12ed113ae
[formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
2013-03-13 09:50:28 -05:00
Greg Armendariz
f121df7e86
Merge "Issue #1638 fix build" into development
...
Former-commit-id: 28eec498f3
[formerly cc168cb94c
] [formerly a06a730696
[formerly 9c0fe6bf68406ef7fbcf6b68888acb24dabb8fd9]]
Former-commit-id: a06a730696
Former-commit-id: 12e912c548
2013-03-13 08:56:00 -05:00
Nate Jensen
5067a7b372
Issue #1638 fix build
...
Change-Id: I2c96c708c30050befc6f87fca41fb306da7ecc5e
Former-commit-id: 975d044ba6
[formerly 192fe9a724
] [formerly 1cbc7bbfdc
[formerly fe7a28034739ec871528f041cfa7a488e5c71378]]
Former-commit-id: 1cbc7bbfdc
Former-commit-id: 733186900f
2013-03-13 08:50:26 -05:00
Dustin Johnson
9f81b57ec0
Issue #1784 Update ColorMapParameters import for ncep plugins
...
Change-Id: I704f2d98eb07531108593de681a9f7ffc67b04e8
Former-commit-id: a5e0b421b5
[formerly 9cd29d7625
] [formerly 0932affd16
[formerly 884757847d855af099219c8ef2715a6319913646]]
Former-commit-id: 0932affd16
Former-commit-id: 64d8fc0ea3
2013-03-13 08:45:54 -05:00
Dustin Johnson
f5a3b57107
Issue #1784 Move NCF bandwidth manager code to data delivery repo
...
Amend:
Publish JUnit test reports as XML, in support of Jenkins.
Fix build/merge of 13.3.1 code so it compiles.
Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4
Former-commit-id: 2983ed29e4
[formerly 71365cd945
] [formerly 1930183036
[formerly 60efd125706d618ae06eb84f959302213da2f7f1]]
Former-commit-id: 1930183036
Former-commit-id: 48a96911c8
2013-03-13 08:39:08 -05:00
Steve Harris
2e1dbdc10d
13.3.1-6.1 baseline
...
Former-commit-id: 6d96471b9b
[formerly fa9d260c2b
] [formerly a062803c8c
[formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]
Former-commit-id: a062803c8c
Former-commit-id: bfa25f3330
2013-03-13 08:28:26 -05:00
Roger Ferrel
a9a0a471f9
Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
...
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4
Former-commit-id: f912d9ece3
[formerly c5a2786c84
] [formerly b5743e8f9b
[formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]]
Former-commit-id: b5743e8f9b
Former-commit-id: 8bb9044e3a
2013-03-12 16:58:06 -05:00
Nate Jensen
a4a5a1e94f
Merge "Issue #1638 fix velocity on windows" into development
...
Former-commit-id: 37d996c64c
[formerly 4486bd9941
] [formerly 676b3c9d11
[formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]]
Former-commit-id: 676b3c9d11
Former-commit-id: 33f185d021
2013-03-12 16:43:13 -05:00
Nate Jensen
35d0187e3d
Issue #1638 fix velocity on windows
...
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a
Former-commit-id: 5e545cc9c4
[formerly 863d4cf3df
] [formerly cbf0343d72
[formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]]
Former-commit-id: cbf0343d72
Former-commit-id: b00ccd2b77
2013-03-12 16:04:59 -05:00
Steve Harris
bca46a1354
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: 36261cb095
[formerly 753a5213ab
] [formerly 0cd7e56e65
[formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]
Former-commit-id: 0cd7e56e65
Former-commit-id: d5bcdb0015
2013-03-12 16:04:23 -05:00
Dave Hladky
155903d135
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: 5c65862b8f
[formerly a1006667e0
] [formerly 4b08491880
[formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: 4b08491880
Former-commit-id: 6ea95002de
2013-03-12 15:48:34 -05:00
Dustin Johnson
f892ae71f7
Merge "Issue #1778 Watch for bandwidth configuration changes" into development
...
Former-commit-id: 13ce9b683d
[formerly 11e7d3b511
] [formerly 6a0a04a519
[formerly f33c6cbe9c63721ec62f57b3953abd48729c8674]]
Former-commit-id: 6a0a04a519
Former-commit-id: 4ec51a98d9
2013-03-12 12:15:50 -05:00
Dustin Johnson
d63cdbfd17
Issue #1778 Watch for bandwidth configuration changes
...
Amend: Peer review comments
Change-Id: Idf4f70677a0ebb082e9cec986c9d17e60645751e
Former-commit-id: 6eed493b3e
[formerly 4c7f7801fa
] [formerly 794812fb23
[formerly ebc03ff41b450140ffa2bb6df44b128a75205a7b]]
Former-commit-id: 794812fb23
Former-commit-id: 33fe353252
2013-03-12 12:02:09 -05:00
Lee Venable
25449b6fe0
Merge "Issue #1760 - fix minutes on the y axis of 3 hour graph" into development
...
Former-commit-id: 1285a3d4af
[formerly c4c8d74cad
] [formerly d68b5ac543
[formerly 85970efae8002eb3f1773942211bd202014fecf2]]
Former-commit-id: d68b5ac543
Former-commit-id: ed5ff858b4
2013-03-12 11:33:17 -05:00
Mike Duff
a712efa614
Issue #1760 - fix minutes on the y axis of 3 hour graph
...
Change-Id: I4f5f77d4307f69015ceade195270434e49198c69
Former-commit-id: a6eea1874b
[formerly 714de645d5
] [formerly 7040daf472
[formerly 1c1c34c7eec36f378cfd2969779f68f9a1de4159]]
Former-commit-id: 7040daf472
Former-commit-id: b5bccd0bb2
2013-03-12 11:25:05 -05:00
Mike Duff
f1f79fc498
Issue #1646 - Format the output
...
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6
Former-commit-id: 75b6040ff6
[formerly d1d694e1db
] [formerly ec0d814aa6
[formerly bdda0e529ccab13fab63e08330b3dcfcef330318]]
Former-commit-id: ec0d814aa6
Former-commit-id: 7fbc376ec4
2013-03-12 10:42:13 -05:00
Lee Venable
b471e3807f
Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
...
Former-commit-id: 9a69cd3524
[formerly d5af1f02c5
] [formerly 28d74d91b0
[formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]
Former-commit-id: 28d74d91b0
Former-commit-id: e080fb5106
2013-03-12 09:08:44 -05:00
Mike Duff
2df046d409
Issue #1781 - Fix Hydro Time Series slow table loads
...
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d
Former-commit-id: 492cf0f7e6
[formerly 6a6844fdaf
] [formerly cac9bd6119
[formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]
Former-commit-id: cac9bd6119
Former-commit-id: caed059e23
2013-03-12 09:03:08 -05:00
Steve Harris
6fe4b16924
13.3.1-6 baseline
...
Former-commit-id: 2e110bd151
[formerly 3a4c7931e1
] [formerly 566b677d09
[formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
2013-03-12 08:35:45 -05:00
Roger Ferrel
0deb290c24
Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
...
Code review changes 3.
Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c
Former-commit-id: 70bd9aafa7
[formerly 4deb731bd0
] [formerly b421c97d86
[formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]
Former-commit-id: b421c97d86
Former-commit-id: 334f2c4a57
2013-03-11 13:00:44 -05:00
Roger Ferrel
7e5bb824d9
Issue #1735 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
...
Code review changes 3.
Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c
Former-commit-id: a73687c1b8
[formerly 6744238fce
] [formerly 9e8472bab6
[formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]
Former-commit-id: 9e8472bab6
Former-commit-id: 3684c7efed
2013-03-11 11:16:22 -05:00
Lee Venable
be87f2adc3
Merge "Issue #1769 Crashing FFMP caused by thread wait" into omaha_13.3.1
...
Former-commit-id: 483e2813ac
[formerly ea6731947e
] [formerly 41c7be5267
[formerly 784852cf5045a32f94ba1923e9fadcd952d45dbb]]
Former-commit-id: 41c7be5267
Former-commit-id: 32221a7a7a
2013-03-08 13:04:28 -06:00
Dave Hladky
dd446abd03
Issue #1769 Crashing FFMP caused by thread wait
...
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611
Former-commit-id: 50696bee89
[formerly 2a854d7c30
] [formerly bb4c54eff0
[formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]
Former-commit-id: bb4c54eff0
Former-commit-id: 73c21a6ead
2013-03-08 09:58:17 -06:00
David Gillingham
b0665586e1
Issue #1759 : Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
...
GfeScriptExecutor and GfeScript.
Change-Id: If3c789549a071e54f9020433f6221e688c51c44a
Former-commit-id: 6b695c6a5e
[formerly 4459ecfa78
] [formerly 1518c0b53c
[formerly a3918b30452a829a8f0cd562021959246bf1144a]]
Former-commit-id: 1518c0b53c
Former-commit-id: 251da90765
2013-03-07 17:25:14 -06:00
Nate Jensen
21863c5db5
Issue #1773 log publish times
...
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85
Former-commit-id: 5d9778a8d6
[formerly 5e3d6df7e0
] [formerly 5c59a61cef
[formerly 392feade3f36680edcdb135f7c061be172210c26]]
Former-commit-id: 5c59a61cef
Former-commit-id: d7902aba68
2013-03-07 16:49:40 -06:00
Dustin Johnson
f808444d6b
Issue #1647 Write out data targeted for the SBN as hidden, then rename
...
Change-Id: I5ea684eb0f3bfa4a97dfdb65b8d50b3774c8760e
Former-commit-id: 84642b4f33
[formerly 959e7e39d3
] [formerly 2a6edae82b
[formerly 71229a6b442ed3a6fc92b2603c2d90507528d495]]
Former-commit-id: 2a6edae82b
Former-commit-id: e5670ffdb4
2013-03-07 14:39:34 -06:00
David Gillingham
94bccc87a3
Issue #1447 : Implement active table fetching, make bug fixes
...
to active table sharing from testing.
Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d
Former-commit-id: 75e82d9fca
[formerly 95f8074c97
] [formerly 0a79d08dd8
[formerly cede300be734c8a05f90b9c84372866d9bd4f695]]
Former-commit-id: 0a79d08dd8
Former-commit-id: 5ad72e2a7f
2013-03-06 14:23:00 -06:00
Nate Jensen
c4175c161f
Issue #1753 log on user shutdown
...
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549
Former-commit-id: f101934a30
[formerly a7e9cfdb39
] [formerly 163f93019b
[formerly f8d4ec45dffcb6c969c2bb94cd924412b0caa308]]
Former-commit-id: 163f93019b
Former-commit-id: d6c3c84d30
2013-03-06 09:36:00 -06:00
Jonathan Sanchez
234d73c905
Issue #1600 Created a utility class for adjust angles.
...
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: 80ea3e1ec2
[formerly 8f70214f66
] [formerly 6a3281c878
[formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]
Former-commit-id: 6a3281c878
Former-commit-id: c2b021427b
2013-03-05 16:02:47 -06:00
Lee Venable
19686f12cc
Merge "Issue #1600 Created a utility class for adjust angles." into development
...
Former-commit-id: 06462c5706
[formerly 3929ef49cd
] [formerly 1854e71f8a
[formerly 52672b8ce9f9f28f707f7f6c1cd7ff61845ab752]]
Former-commit-id: 1854e71f8a
Former-commit-id: 0fc8bcc119
2013-03-05 15:37:18 -06:00
Jonathan Sanchez
40f52ab049
Issue #1600 Created a utility class for adjust angles.
...
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: 3fface264c
[formerly 1a91fe52e7
] [formerly 1f2db32448
[formerly 14676fe089c0132febc3f533e6cbf2d00f117b90]]
Former-commit-id: 1f2db32448
Former-commit-id: 42bcef0be0
2013-03-05 15:05:19 -06:00
Dustin Johnson
ec0e13e509
Merge "Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks" into development
...
Former-commit-id: def94b337f
[formerly 2262872d2d
] [formerly 90b18cc477
[formerly fdb6fdd88c80e1f9d33c5d0b72aca389910599ed]]
Former-commit-id: 90b18cc477
Former-commit-id: c28f99971c
2013-03-05 15:01:02 -06:00
Dustin Johnson
b88a1eefc1
Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
...
Former-commit-id: 21abece1f2
[formerly d4c6c29f5f
] [formerly 3eddb2d286
[formerly 6fd60728a421630cea913d11db02b48f7940554e]]
Former-commit-id: 3eddb2d286
Former-commit-id: bfed4555a2
2013-03-05 13:32:04 -06:00
Steve Harris
4a0b8772ec
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 6b13492420
[formerly d5b80f9225
] [formerly aa0e9acefd
[formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: aa0e9acefd
Former-commit-id: b9563da8a8
2013-03-05 12:29:44 -06:00
Steve Harris
b423579e4a
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 61a19a460b
[formerly 305dd72969
] [formerly 57f42761d7
[formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 57f42761d7
Former-commit-id: a8e1557c62
2013-03-05 12:27:49 -06:00
Richard Peter
4cd4aae773
Merge "Issue #1750 - edexBridge will now set the QPID persistence flag" into development
...
Former-commit-id: a077fe35b5
[formerly a44ee67d00
] [formerly 993f4ff2bd
[formerly 8a29ff0890d07e02623e67dacd08d506c7c85d3a]]
Former-commit-id: 993f4ff2bd
Former-commit-id: 11afc055c5
2013-03-05 12:10:31 -06:00
Dustin Johnson
8c99bc1f17
Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks
...
Change-Id: Idcd9cc06543582252ddbabe42d7c30cb741dfbdd
Former-commit-id: 2bd62ad4b6
[formerly 8107f76d98
] [formerly 547780f9a3
[formerly ec1ed5a20e1aca5761fd0ed62b450a8fa6f70ecc]]
Former-commit-id: 547780f9a3
Former-commit-id: 043f122356
2013-03-05 11:39:42 -06:00
Mike Duff
af84910ac6
Issue #1752 - Lock down user admin dialog
...
Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb
Former-commit-id: 9d99eea617
[formerly 6809cb6f80
] [formerly 193cf1e54f
[formerly e43718de9e5b0f73e4168c724f82eb021e616a34]]
Former-commit-id: 193cf1e54f
Former-commit-id: 775a0e3edd
2013-03-05 11:26:54 -06:00
Steve Harris
a240379588
13.3.1-5 baseline
...
Former-commit-id: 8123d5ac45
[formerly a89221c75b
] [formerly e26f7eb151
[formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: e26f7eb151
Former-commit-id: a40c9136fe
2013-03-05 10:47:06 -06:00
Steve Harris
3e0614b43a
13.3.1-4 baseline
...
Former-commit-id: d79303de13
[formerly 8c0b90f292
] [formerly 2edca90902
[formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 2edca90902
Former-commit-id: 5e55ded3a9
2013-03-05 10:39:59 -06:00
Nate Jensen
3c5ca0546f
Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
...
Former-commit-id: b393674ef3
[formerly b803ae3801
] [formerly a952d48b3e
[formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]
Former-commit-id: a952d48b3e
Former-commit-id: e3db522be4
2013-03-05 09:10:52 -06:00
Nate Jensen
70c75b3bcd
Merge "Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build" into development
...
Former-commit-id: c21079cc06
[formerly 75d959f536
] [formerly 8d44b9ea05
[formerly 9d53ac277f9a83c7060552e5becda2b2d708ee9e]]
Former-commit-id: 8d44b9ea05
Former-commit-id: 910b8c7d25
2013-03-05 09:10:31 -06:00
Dustin Johnson
9932db9b09
Merge "Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions" into development
...
Former-commit-id: 9a6b647989
[formerly c6137e89e7
] [formerly ef632b7bfa
[formerly aae57f37aa7da6374958220bc09f91fd0d05a3b1]]
Former-commit-id: ef632b7bfa
Former-commit-id: b3f7f77bf6
2013-03-05 08:53:09 -06:00
Bryan Kowal
0d9400b2ec
Issue #1750 - edexBridge will now set the QPID persistence flag
...
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98
Former-commit-id: d484acbca0
[formerly 3a8efd5edf
] [formerly 8b4dce1c3d
[formerly d466b647d0d810418a88c875f39e55d98d680aa1]]
Former-commit-id: 8b4dce1c3d
Former-commit-id: eba8ccc6cd
2013-03-04 17:58:04 -06:00