Benjamin Phillippe
1fa596463d
Issue #1335 Fixed EHCache warnings. Changes to necessary config files
...
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8
Former-commit-id: 5c31b34e12
[formerly 5bf46d468d
[formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]
Former-commit-id: 5bf46d468d
Former-commit-id: 44519995ee
2012-11-15 13:35:25 -06:00
Max Schenkelberg
61f0c0501b
Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
...
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.
Amend: Rebased
Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567
Former-commit-id: 28e61c8285
[formerly dcde9e8951
[formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]
Former-commit-id: dcde9e8951
Former-commit-id: fe11e31bfb
2012-11-14 16:19:37 -06:00
Nate Jensen
c4cc7b638c
Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
...
Former-commit-id: 31637efbbc
[formerly 49c2079963
[formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]
Former-commit-id: 49c2079963
Former-commit-id: 0398aeaa5b
2012-11-14 16:09:00 -06:00
Dustin Johnson
069c8d4788
Merge branch 'ss_builds' (12.12.1-4) into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java
Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71
Former-commit-id: 0d1d663f41
[formerly bff32bbe58
[formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: bff32bbe58
Former-commit-id: d27bce13c2
2012-11-14 14:41:57 -06:00
Steve Harris
b968ab5135
12.12.1-4 baseline
...
Former-commit-id: 57578da521
[formerly 85130eb611
[formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 85130eb611
Former-commit-id: b91b7f0fae
2012-11-14 14:19:20 -06:00
Ben Steffensmeier
233398088a
Issue #189 changes to mappings and ncep merge from code review
...
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47
Former-commit-id: 2d864c3b09
[formerly 2c8f3f09ac
[formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]
Former-commit-id: 2c8f3f09ac
Former-commit-id: 3d126b41e1
2012-11-14 12:22:53 -06:00
Dustin Johnson
f1cfa9a60d
Issue #1322 Common baseline changes to support BandwidthManager
...
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: 7c59f9ea41
[formerly 7d9e7567bd
[formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]
Former-commit-id: 7d9e7567bd
Former-commit-id: afd9a767ea
2012-11-14 12:19:10 -06:00
Ron Anderson
31d37c7a8f
Merge "Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb" into development
...
Former-commit-id: 0fe91e0d95
[formerly 86c4a247cd
[formerly 46116a80d319050628e6c8a7d01c7c2d0bb5402f]]
Former-commit-id: 86c4a247cd
Former-commit-id: 29559e851e
2012-11-14 11:23:06 -06:00
Ben Steffensmeier
af2808c4f4
Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb
...
Former-commit-id: 1b4236ccc5
[formerly 5a1a6f2fdb
[formerly 26e79c68560dced9b7148e8eebf4a7394461bd7c]]
Former-commit-id: 5a1a6f2fdb
Former-commit-id: 6e6823d62d
2012-11-14 11:05:42 -06:00
Steve Harris
fb70b19b31
Merge "Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml" into development
...
Former-commit-id: 956e1a45da
[formerly f5c87b04d6
[formerly ce25af9ad1e713bd85fd24f10188c9f46c83da5c]]
Former-commit-id: f5c87b04d6
Former-commit-id: ac834c0ebb
2012-11-14 10:19:27 -06:00
Ben Steffensmeier
2ca7447dee
Issue #1331 fix grib-request spring
...
Former-commit-id: c97223458e
[formerly b128a3f3c5
[formerly 3b4dda66b20f04915f406df814ca989350794ae7]]
Former-commit-id: b128a3f3c5
Former-commit-id: 23190381cd
2012-11-14 10:07:44 -06:00
Brad Gonzales
de29d9feba
Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml
...
Change-Id: I6de95db502206b7b4dda198d61844570ed428862
Former-commit-id: 1617341e2a
[formerly 4af27e092f
[formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]
Former-commit-id: 4af27e092f
Former-commit-id: 782ffb92ea
2012-11-14 09:39:26 -06:00
Steve Harris
1ee8938748
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 00f3d51546
[formerly 448dd1c35f
[formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 448dd1c35f
Former-commit-id: 8fc896f7d4
2012-11-13 17:28:50 -06:00
Steve Harris
48fa2a9106
12.12.1-3 baseline
...
Former-commit-id: b3b5e6d28f
[formerly c999505fba
[formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]
Former-commit-id: c999505fba
Former-commit-id: a81c46987b
2012-11-13 17:27:04 -06:00
Steve Harris
7192b19284
12.12.1-2 baseline
...
Former-commit-id: 6868eb9b23
[formerly a8560580f8
[formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: a8560580f8
Former-commit-id: ed809a02db
2012-11-13 17:14:24 -06:00
Ben Steffensmeier
626f398224
Merge branch 'ss_builds'(12.12.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc
Former-commit-id: e8090e654b
[formerly 69fc030bb4
[formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: 69fc030bb4
Former-commit-id: ed4f88aa22
2012-11-13 16:00:19 -06:00
Mike Duff
24aa44a46d
Issue #1317 - Fix problem in edexProcessStats.xml
...
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03
Former-commit-id: e14b372f42
[formerly 0e32ab85db
[formerly 756c1b6b22cdf91c44f4bb1ec75dca8bb8074eef]]
Former-commit-id: 0e32ab85db
Former-commit-id: 248db814c1
2012-11-13 11:44:02 -06:00
Nate Jensen
73636a68e9
Merge "Issue #1323 initial commit of interfaces of data access framework" into development
...
Former-commit-id: ff16f82b18
[formerly c2631b5ba6
[formerly 68fbcd4c991c6962c27f5aa07b749f0706bfe668]]
Former-commit-id: c2631b5ba6
Former-commit-id: b43634a58f
2012-11-13 09:01:43 -06:00
Nate Jensen
35ea1b7773
Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
...
Former-commit-id: e51d86ce3a
[formerly 8a1f3a10a4
[formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]
Former-commit-id: 8a1f3a10a4
Former-commit-id: 254e88a70c
2012-11-12 17:16:07 -06:00
Max Schenkelberg
1ed5f10230
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
...
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: 00822a4f39
[formerly d1099addc6
[formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]
Former-commit-id: d1099addc6
Former-commit-id: 30c1802398
2012-11-12 16:46:21 -06:00
Nate Jensen
d7f7152e93
Issue #1323 initial commit of interfaces of data access framework
...
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02
Former-commit-id: bf72e29752
[formerly f255f65b3c
[formerly d6b63788ef2af3da474a0d3affcafdddec3690a5]]
Former-commit-id: f255f65b3c
Former-commit-id: b24c9eb456
2012-11-12 16:45:33 -06:00
Ben Steffensmeier
dfe697a59c
Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
...
Former-commit-id: b5b472dee1
[formerly 7d3f479031
[formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]
Former-commit-id: 7d3f479031
Former-commit-id: 65441372df
2012-11-12 15:15:49 -06:00
Ben Steffensmeier
f0add08709
Issue #1108 fix the order of arguments for grib 1 parameter mappings
...
Former-commit-id: c4f99aae63
[formerly adf0fec9a2
[formerly 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb]]
Former-commit-id: adf0fec9a2
Former-commit-id: 894998b95f
2012-11-09 13:36:49 -06:00
Ben Steffensmeier
a0f6c320cb
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 693090cb36
[formerly 535c73051d
[formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]
Former-commit-id: 535c73051d
Former-commit-id: 20e618eb4f
2012-11-08 14:45:36 -06:00
Richard Peter
cd8c43078b
Merge "Issue #189 add more comments to grib decoder." into development
...
Former-commit-id: 7077a82458
[formerly db28cc26aa
[formerly 1ad439769c601fe61365f015bc56da0442553be5]]
Former-commit-id: db28cc26aa
Former-commit-id: 7f49c5fe04
2012-11-08 14:40:05 -06:00
Ben Steffensmeier
c17b92afc5
Issue #189 merge ncep changes to unified grid.
...
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: fbed67a208
[formerly e6b0751f5c
[formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]
Former-commit-id: e6b0751f5c
Former-commit-id: f62cf2713d
2012-11-08 14:34:55 -06:00
Richard Peter
50ddeed8e6
Merge "Issue #189 fix another Unknown Model" into development
...
Former-commit-id: 675b1666fd
[formerly 7d8dfb9c01
[formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]]
Former-commit-id: 7d8dfb9c01
Former-commit-id: 10138f3ae8
2012-11-08 13:43:37 -06:00
Richard Peter
fbe5195de2
Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
...
Former-commit-id: 2e9cdbe43e
[formerly 3450ca3cd3
[formerly 6fce68b90116d30cf090db64032322916276136b]]
Former-commit-id: 3450ca3cd3
Former-commit-id: 62e5aff255
2012-11-08 13:30:27 -06:00
Dustin Johnson
67e02347b5
Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
...
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c
Former-commit-id: 9784b563cf
[formerly ddaa681d8a
[formerly 217a17fe79d9156f03597d72e51ab47325b00991]]
Former-commit-id: ddaa681d8a
Former-commit-id: 1220f5167e
2012-11-08 12:00:15 -06:00
Nate Jensen
00dcf33480
Merge "Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time." into development
...
Former-commit-id: 01072652dc
[formerly 96cb1ecc7f
[formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]
Former-commit-id: 96cb1ecc7f
Former-commit-id: e3487942ac
2012-11-08 11:08:48 -06:00
Mike Duff
7398e4fd68
Issue #1317 - Update the stats config files
...
Issue #1317 - Peer review comments.
Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f
Former-commit-id: 50f0c4c226
[formerly 1372c08cdc
[formerly 8cc9210d25324ab4b5cbd5af3687b371101d282b]]
Former-commit-id: 1372c08cdc
Former-commit-id: e72c2822ad
2012-11-08 10:15:41 -06:00
Max Schenkelberg
001d0710e7
Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time.
...
Change-Id: Icc7f89812936f97029e2a06adbc527ec658d8d9b
Former-commit-id: c80dbffad8
[formerly 9aa4221fdf
[formerly 598e0268c95155536fb94798cc134d18b2566dbc]]
Former-commit-id: 9aa4221fdf
Former-commit-id: 5f0b4286ba
2012-11-08 10:08:38 -06:00
Dustin Johnson
acd4cf94d8
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
...
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: 1dbeb22893
[formerly 064ef82d1e
[formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 064ef82d1e
Former-commit-id: efd3d3735a
2012-11-08 09:57:16 -06:00
Bryan Kowal
872c104321
Issue #1318 - fix first dat dependency issue.
...
Change-Id: If7e1668799a8523afebb0d4b7de76be6add5aa78
Former-commit-id: 88a5451ce1
[formerly 079fdb33a0
[formerly 0087827da79fedd354a227bad4e02aa76cebc684]]
Former-commit-id: 079fdb33a0
Former-commit-id: a4d6021e5f
2012-11-08 07:27:39 -06:00
Nate Jensen
b0bb920fde
Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development
...
Former-commit-id: 6b205399d4
[formerly b32a9e839e
[formerly 1902ab64c3ab11c41af906e5d78368689833561f]]
Former-commit-id: b32a9e839e
Former-commit-id: 20a63254e2
2012-11-07 18:18:06 -06:00
Brad Gonzales
04d7e36077
Issue #1309 added units to Aggregate.java and AggregateRecord.java
...
Amend:
Changed ProcessEvent.processingTime and ProcessEvent.processingLatency to longs.
Removed Unit from AggregateRecord.java.
Change-Id: If4f6fccb65c584055d68129874a398d6391155e7
Former-commit-id: 4c49c9116d
[formerly 577df6943e
[formerly 3afbeecdaecfb9ab7cea7e59db688639dbdad972]]
Former-commit-id: 577df6943e
Former-commit-id: 2a0b6ad151
2012-11-07 15:36:44 -06:00
Steve Harris
8278cac143
12.12.1-1 baseline
...
Former-commit-id: e1498006c7
[formerly e4bd20a515
[formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e4bd20a515
Former-commit-id: c2839cc86d
2012-11-07 12:41:20 -06:00
Nate Jensen
1f4489d2b0
Merge "Issue #1276 - v1.0 of multiple WA deployment support" into development
...
Former-commit-id: 433a79e689
[formerly 2cf2e79f34
[formerly bab65855839a69e29d90582e021d13ae439242ce]]
Former-commit-id: 2cf2e79f34
Former-commit-id: 904120bb43
2012-11-07 11:04:45 -06:00
Ben Steffensmeier
690297bb4d
Issue #189 fix another Unknown Model
...
Former-commit-id: 64f59b94e4
[formerly eaa7e420df
[formerly 7dfb29c93784505c0b3aad37c631afe6f5ecf14f]]
Former-commit-id: eaa7e420df
Former-commit-id: 643212a0ad
2012-11-07 10:56:26 -06:00
Max Schenkelberg
94e64c9b0d
Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
...
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345
Former-commit-id: ca4177dd08
[formerly 2f90120248
[formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: 2f90120248
Former-commit-id: f069f34a96
2012-11-07 10:44:42 -06:00
Richard Peter
aabb8e044f
Merge "Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties." into development
...
Former-commit-id: 67471e4453
[formerly 51638344a8
[formerly 45cd4048eeda02b7eb8199e4514ad4ec9f3b7c03]]
Former-commit-id: 51638344a8
Former-commit-id: ec86e24f71
2012-11-07 09:32:25 -06:00
Ben Steffensmeier
f5dede12c7
Issue #189 add more comments to grib decoder.
...
Former-commit-id: 237a7ea992
[formerly 67db4ae4e4
[formerly fdc27da79f1da6c2bda0f3061096227d95745c46]]
Former-commit-id: 67db4ae4e4
Former-commit-id: 397ebf02f6
2012-11-06 18:30:03 -06:00
Bryan Kowal
7ecbbdfdbb
Issue #1276 - v1.0 of multiple WA deployment support
...
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5
Former-commit-id: 4fd43ee45c
[formerly 9263a0ac57
[formerly 2d35b221dca2248da68ae1d11f20b40dfb11052c]]
Former-commit-id: 9263a0ac57
Former-commit-id: cae04523db
2012-11-06 16:13:26 -06:00
Richard Peter
76e97d7ab4
Issue #1257 : Fix Tropical Test Tool
...
Change-Id: I50c1d7e703d0d5e825ab9825f7fdbcd17ac0e49b
Former-commit-id: e3da5faf40
[formerly 45b25ead66
[formerly ffb46aa8beab26ce61aa27eaeb8da41a417a24c0]]
Former-commit-id: 45b25ead66
Former-commit-id: 449ad67f82
2012-11-06 08:47:41 -06:00
Brad Gonzales
7acf0f1874
Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties.
...
Amend:
removed groupBy attribute "fileName"
added LogLevel enum and attribute to Event.java. Default level is DEBUG.
Change-Id: I13c155b1fae19cf5a3c82fbb633bf6c7fb217c07
Former-commit-id: a4bc175653
[formerly 6ddd1cbdb3
[formerly 51802e671ac15d451fec19262dfa7a352f0e4c09]]
Former-commit-id: 6ddd1cbdb3
Former-commit-id: cbce70fd0b
2012-11-06 07:31:19 -06:00
Ron Anderson
ddc1ac018c
Merge "Issue #1310 : Tie D2DParmIdCache rebuilds to grid purge, not grib purge." into development
...
Former-commit-id: 52007a3a00
[formerly 257213e491
[formerly a13ecc678d2fb7bf0e58922e07e3b5df60a197f4]]
Former-commit-id: 257213e491
Former-commit-id: 5edafa6c86
2012-11-05 17:33:06 -06:00
Nate Jensen
fe0e8aed85
Merge "Issue #1257 : Fix hdf5 purge as well as obs defining multiple default rules. Clean up old purgeRules in deleted plugin. Fix concurrency on ProcessUtil"" into development
...
Former-commit-id: a6d062fb14
[formerly 1c1da71b38
[formerly cc63210970aecee47339eb1bb0d774ed1b5b7f2b]]
Former-commit-id: 1c1da71b38
Former-commit-id: 4ce1b0f752
2012-11-05 16:32:54 -06:00
Richard Peter
e04bb21d8f
Issue #1257 : Fix hdf5 purge as well as obs defining multiple default rules. Clean up old purgeRules in deleted plugin. Fix concurrency on ProcessUtil"
...
Change-Id: I984bb34f88ecda1e57ccac462acbced7240846a0
Former-commit-id: 170e205c88
[formerly 023bed9bcf
[formerly 3d04fdb509db0a5d46e215bdc2595c07d15575b2]]
Former-commit-id: 023bed9bcf
Former-commit-id: bb475bdbf3
2012-11-05 15:19:04 -06:00
Richard Peter
80023b6c2e
Merge "Issue #189 fix several Unknown Models" into development
...
Former-commit-id: d2e47212c6
[formerly 9d917020b6
[formerly fce6826da3fc3b1848e890e552c566580b4e6f29]]
Former-commit-id: 9d917020b6
Former-commit-id: 04f3a7ee16
2012-11-05 14:03:14 -06:00
David Gillingham
6cd39983d5
Issue #1310 : Tie D2DParmIdCache rebuilds to grid purge, not grib purge.
...
Change-Id: I7953a3405c11656f4723b4840ff6e2d15c0a11d7
Former-commit-id: e0c7243c74
[formerly 11f109976e
[formerly 358867e5631dab8fbfdf3158d07e3875f949205a]]
Former-commit-id: 11f109976e
Former-commit-id: 4237143dd0
2012-11-05 14:00:15 -06:00