Ben Steffensmeier
8c386a2aac
Issue #2537 point data code cleanup.
...
Former-commit-id: a4e3a4a03b
[formerly a4e3a4a03b
[formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]
Former-commit-id: 7889c14b35
Former-commit-id: 62ca7b1df6
2013-11-26 15:16:54 -06:00
Ben Steffensmeier
b1de6a34eb
Issue #2574 Add DataURIFieldConverter for GridCoverages.
...
Former-commit-id: 08be03d3fa
[formerly 08be03d3fa
[formerly 452e129cda35ffe0b4b8d9bd262bd80bfa88d701]]
Former-commit-id: bdb0e111ea
Former-commit-id: f7b1015dca
2013-11-25 12:17:36 -06:00
Nate Jensen
7ffe17a73e
Merge "Issue #2359 add ability to ignore messages based on threads, ie ignore shef" into development
...
Former-commit-id: 00fa91223b
[formerly 00fa91223b
[formerly c4baf73e044c156a942290b8be603d9c9621d9fe]]
Former-commit-id: 38cc0b46f6
Former-commit-id: be4943ae3d
2013-11-25 08:34:40 -06:00
Nate Jensen
493f51eae7
Issue #2359 add ability to ignore messages based on threads, ie ignore
...
shef
Change-Id: I51d4b29e7accb3ce5bd90c7478c7f143bd76bb48
Former-commit-id: 4a4f50155c
[formerly 4a4f50155c
[formerly 4a9f2db86a148b58610680dbd2230b286d89e361]]
Former-commit-id: ed1b94ea07
Former-commit-id: 3b0ed49de4
2013-11-22 15:54:22 -06:00
Richard Peter
91fcef9d3f
Merge "Issue #2532 Fix grid displays of grids larger than the world." into development
...
Former-commit-id: b26e562845
[formerly b26e562845
[formerly f2df036fd63196cd8e7f29cbb80944099c2db92a]]
Former-commit-id: be7c2ef08e
Former-commit-id: c51cc4bf17
2013-11-22 12:38:05 -06:00
Nate Jensen
54c2d1e420
Merge "Issue #2361 fix style manager's jaxb context" into development
...
Former-commit-id: 9de7c7f434
[formerly 9de7c7f434
[formerly 0b018d8cd8f9738eb11897f07a83a5e370dcbcac]]
Former-commit-id: 49ce4d4be3
Former-commit-id: 6ab6de4419
2013-11-22 10:08:13 -06:00
Nate Jensen
b6748206e5
Issue #2361 fix style manager's jaxb context
...
Change-Id: I273c2361739e7860bd92a8c86d8f806b677f1f68
Former-commit-id: 16329ab06b
[formerly 16329ab06b
[formerly 2fddfc61fb8de88a67deb5b66a570ca548628ab3]]
Former-commit-id: 328991e577
Former-commit-id: ebc3efdf80
2013-11-22 09:15:24 -06:00
Dave Hladky
54af53ffb4
Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display
...
Former-commit-id: 04c7e2cffc
[formerly 04c7e2cffc
[formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]
Former-commit-id: a9a3973319
Former-commit-id: ebd6d5cbe1
2013-11-21 14:46:47 -06:00
Nate Jensen
a5469c1d9e
Merge "Issue #2033 fix plots working with multiple plotModels dirs contributed by different plugins" into development
...
Former-commit-id: ddb0eaf0ff
[formerly ddb0eaf0ff
[formerly 8f5078ce2a5369c62073a70b1772c2d0c96317fa]]
Former-commit-id: d851e6fc97
Former-commit-id: f60948fc36
2013-11-21 10:12:11 -06:00
Nate Jensen
eb0f52cfca
Merge "Issue #2448 Fixed problem that set subscription start time to first cycle time. Fixed problem that set subscription end time to end of day." into development
...
Former-commit-id: 982a664301
[formerly 982a664301
[formerly 8c71361680cbe5860cbd4d76c3908cfbef23068f]]
Former-commit-id: 695262552f
Former-commit-id: 198ff37bd7
2013-11-21 08:36:59 -06:00
Nate Jensen
19b467c208
Issue #2033 fix plots working with multiple plotModels dirs contributed
...
by different plugins
Change-Id: I2d1ff75c62395ead5154398002610401faa4388d
Former-commit-id: 9371c63c41
[formerly 9371c63c41
[formerly 0ed68f5ec6b2b2f3413f7de5f9c7b15291afb85c]]
Former-commit-id: 2b6799712d
Former-commit-id: 3e88de72dc
2013-11-20 17:33:53 -06:00
Brad Gonzales
70f66e5f7a
Issue #2448 Fixed problem that set subscription start time to first cycle time.
...
Fixed problem that set subscription end time to end of day.
Change-Id: Icccdbe4e38581f5194f6fde8d52f280d1a456a65
Former-commit-id: 93b47ce68b
[formerly 93b47ce68b
[formerly d8040be0d01c11fc7bfafe40a7afe509ba372ea0]]
Former-commit-id: d2cfc5986a
Former-commit-id: 04d7bff784
2013-11-20 15:49:27 -06:00
Greg Armendariz
c94e59646b
Merge "Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring. Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription handlers will be injected through spring. Removed the SBN route from wfo mode." into development
...
Former-commit-id: 93daf9aff4
[formerly 93daf9aff4
[formerly 243e06d507ee85bfa7e30f5da41c146afa4d1043]]
Former-commit-id: bc6c4e2b32
Former-commit-id: ce2ef25207
2013-11-20 12:26:30 -06:00
Brad Gonzales
6e19c4dab1
Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added
...
monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and
shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring.
Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry
was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other
beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and
ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription
handlers will be injected through spring. Removed the SBN route from wfo mode.
Amend: Comment updates from peer review.
Change-Id: Ic4c0dca8ebf1e86537e46a6231af58bb65c83cf8
Former-commit-id: 053f20c70b
[formerly 053f20c70b
[formerly c245f741b9e78d8e4503698336d9929536e72e0d]]
Former-commit-id: 95a1914c71
Former-commit-id: 04829d37e2
2013-11-20 11:58:33 -06:00
Ben Steffensmeier
1bc4453a8d
Issue #2532 Fix grid displays of grids larger than the world.
...
Former-commit-id: d3ed1ba356
[formerly d3ed1ba356
[formerly e607da0bb204d61cbc998595f52406605c1953e0]]
Former-commit-id: 41753c40b5
Former-commit-id: 07743c4369
2013-11-20 11:11:03 -06:00
Brian Clements
2e4dc2000e
Issue #2393 removed pypies interpolation
...
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code
Former-commit-id: fe58826a1e
[formerly fe58826a1e
[formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]
Former-commit-id: 0f40ae2b99
Former-commit-id: b762864f88
2013-11-20 08:40:12 -06:00
Bryan Kowal
91367f57b6
Issue #2552 - replace Logger with UFStatus
...
Former-commit-id: ff968c9884
[formerly ff968c9884
[formerly 10971eca8d10817c97073c6142ea7cf08b28fa27]]
Former-commit-id: 0bdb25bf43
Former-commit-id: da148196ac
2013-11-19 17:11:36 -06:00
Lee Venable
d3b12f6973
Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development
...
Former-commit-id: f8f0a0e41e
[formerly f8f0a0e41e
[formerly 6d5026a25af31f0ae8c29d1036d9358366550f75]]
Former-commit-id: d42c36f365
Former-commit-id: da5cfb3d8e
2013-11-19 15:12:38 -06:00
Nate Jensen
ac93e07973
Merge "Issue #2361 don't initialize derived parameters on shutdown" into development
...
Former-commit-id: c6d6b07e3f
[formerly c6d6b07e3f
[formerly 4ae0820b630f25bda177572ffe77fbea52b4fd82]]
Former-commit-id: a610825ef9
Former-commit-id: 04de350ae7
2013-11-19 14:11:01 -06:00
Richard Peter
8efa7a1512
Merge "Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed" into development
...
Former-commit-id: 4c9bcf718a
[formerly 4c9bcf718a
[formerly d3559746302f09db933f9b8deecfe410e63d8430]]
Former-commit-id: b296fd1d02
Former-commit-id: ba8fae576c
2013-11-19 13:18:05 -06:00
Nate Jensen
cf87d1c335
Issue #2361 don't initialize derived parameters on shutdown
...
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583
Former-commit-id: c90a7d7b3c
[formerly c90a7d7b3c
[formerly 13cc948c57d52261c700157f8e86b6e6c75b4fe1]]
Former-commit-id: 5aee685557
Former-commit-id: e9adf706ba
2013-11-19 12:59:10 -06:00
Mike Duff
fcc96787c3
Issue #1531 - Made bandwidth utilization graph resizable.
...
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475
Former-commit-id: ed73a7e55a
[formerly ed73a7e55a
[formerly d6de10ca2c0609899bdb1f4c5f3de22a62d58998]]
Former-commit-id: 71093a685e
Former-commit-id: 437df90354
2013-11-19 12:51:06 -06:00
Nate Jensen
0015c66955
Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development
...
Former-commit-id: 6927e960b2
[formerly 6927e960b2
[formerly 59c62c673625d7e87b3b86575b8ebfb9e328ff28]]
Former-commit-id: 5885d8027b
Former-commit-id: be3d016f93
2013-11-19 11:25:19 -06:00
Steve Harris
77d9b628fe
Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge
...
Former-commit-id: c37908caa8
[formerly c37908caa8
[formerly f0792ba7de783225b4c13970dff87bb7b17f4f94]]
Former-commit-id: 39ab54c912
Former-commit-id: 94a60728ca
2013-11-19 10:08:45 -06:00
Mike Duff
d254f954c4
Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed
...
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2
Former-commit-id: c908647259
[formerly c908647259
[formerly cacc7a8560c589b24ea98191f152c31479c5631e]]
Former-commit-id: 665d9e7651
Former-commit-id: 5afa90b967
2013-11-19 08:55:27 -06:00
Nate Jensen
a5abd4dad0
Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
...
Former-commit-id: edf51dffc9
[formerly edf51dffc9
[formerly b6420738e49d37840789c88089ecc8bab1103284]]
Former-commit-id: 3d51d80170
Former-commit-id: f07f543cd3
2013-11-18 12:50:38 -06:00
Nate Jensen
b6fe32de06
Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
...
Former-commit-id: 0dbe79344a
[formerly 0dbe79344a
[formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]]
Former-commit-id: 827b7f5a93
Former-commit-id: 6900d4e47f
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
9bd35b793d
Issue #2543 fix gl buffer formating problems
...
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc
Former-commit-id: 105e3e359a
[formerly 105e3e359a
[formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]]
Former-commit-id: e7a068e595
Former-commit-id: e605758e57
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
55f26e277f
Issue #2544 Fix recycling issues with Satellite resources.
...
Former-commit-id: e392185d78
[formerly e392185d78
[formerly 166957a22c3447fa2407b13362eece24943675c9]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 1875f56695
2013-11-18 11:44:56 -06:00
Nate Jensen
951c1ff2f3
Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
...
Former-commit-id: 4f47800cae
[formerly 4f47800cae
[formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]
Former-commit-id: 0146ae59df
Former-commit-id: a238ba2ba3
2013-11-18 11:39:12 -06:00
Steve Harris
c26818afe6
Merge branch 'omaha_14.1.1' (14.1.1-9) into development
...
Conflicts:
cots/org.jep.linux32/libjep.so
cots/org.jep.linux64/libjep.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
(took all the omaha_14.1.1 versions)
Former-commit-id: 0a36987a01
[formerly 0a36987a01
[formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 869b505f80
2013-11-15 13:15:25 -06:00
Steve Harris
7127a1e665
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Conflicts:
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)
Former-commit-id: 1015e180f1
[formerly 1015e180f1
[formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: d97edb20d1
2013-11-15 13:05:40 -06:00
Steve Harris
ea382798b5
14.1.1-9 baseline
...
Former-commit-id: f8f995b697
[formerly f8f995b697
[formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 8c136f202d
2013-11-15 12:47:49 -05:00
Brad Gonzales
4499a8d1de
Issue #2545 EdexBandwidthManager check for subsription event types before sending notifications.
...
Added missing comma to com.raytheon.edex.plugin.text.
Change-Id: Ifc970d31d8f2db29dc5a4749967cdedad84b6162
Former-commit-id: aa8fb36fc1
[formerly aa8fb36fc1
[formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]
Former-commit-id: 53d4de12d9
Former-commit-id: 490c95d010
2013-11-15 08:00:47 -06:00
Nate Jensen
f2c777ff48
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: dd99aa3f47
[formerly dd99aa3f47
[formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]
Former-commit-id: 78b01f61c4
Former-commit-id: d96cdbe761
2013-11-14 17:41:24 -06:00
Mike Duff
0f2626f79f
Issue #2548 - fix malformed comment
...
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034
Former-commit-id: 414cb1cf68
[formerly 414cb1cf68
[formerly 52462f299735aacee3db09faa6db9f28ba91f552]]
Former-commit-id: 95fda38cc5
Former-commit-id: 7be43c4a52
2013-11-14 17:30:55 -06:00
Richard Peter
38d2c6564a
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
...
Former-commit-id: 14b1e924a1
[formerly 14b1e924a1
[formerly dba301df2f593baa951c14b684e7ce4794e32019]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 1a7dd7723b
2013-11-14 17:21:48 -06:00
Brian Clements
e7c355df52
Issue #2361 fixed ncwf hibernate pickup
...
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names
Former-commit-id: cacdf313c5
[formerly cacdf313c5
[formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]
Former-commit-id: 00490c2db2
Former-commit-id: ab24330f23
2013-11-14 17:12:02 -06:00
Mike Duff
5fdf101af6
Issue #2548 - Add a subscription type slot for uniqueness.
...
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 47011a70db
[formerly 47011a70db
[formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]
Former-commit-id: 47a0477587
Former-commit-id: b929b7aa02
2013-11-14 17:07:54 -06:00
Nate Jensen
7ec18ba0b1
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
...
Former-commit-id: b4bcd14a85
[formerly b4bcd14a85
[formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]
Former-commit-id: c2aacfc437
Former-commit-id: a8a1e396fe
2013-11-14 16:34:28 -06:00
Bryan Kowal
4275b195ce
Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring.
...
Amend: datadelivery jaxables are now injected
Amend: created a getInstance method for EbxmlJaxbManager
Amend: use value instead of bean in spring configuration
Change-Id: Ib6c11b03964fbaeee24db352a8f0acc1b43fa3c0
Former-commit-id: be78fab116
[formerly be78fab116
[formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]]
Former-commit-id: ce16efc9a1
Former-commit-id: a6ea71d46f
2013-11-14 15:17:28 -06:00
Richard Peter
e7d8e5e560
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 8fb79e7b73
[formerly 8fb79e7b73
[formerly 13d284277bed2f0f731547ec443a262556df997c]]
Former-commit-id: c42f931118
Former-commit-id: 2b95bcfb31
2013-11-14 14:56:59 -06:00
Lee Venable
ad77be1b44
Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
...
Former-commit-id: 834c2ac8da
[formerly 834c2ac8da
[formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]]
Former-commit-id: f0ebee3bb3
Former-commit-id: 7d04b2e4ce
2013-11-14 14:43:18 -06:00
Mike Duff
cf077ed7f9
Issue #2538 - Check for existing adhoc queries in registry.
...
Peer review comments
Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0
Former-commit-id: 87a4b1bec4
[formerly 87a4b1bec4
[formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]
Former-commit-id: a80964bc7c
Former-commit-id: 4557a06f42
2013-11-14 14:40:33 -06:00
Richard Peter
e2a16fd876
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
...
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: 79bdd34f4f
[formerly 79bdd34f4f
[formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]
Former-commit-id: 0074b774f0
Former-commit-id: 96b4944b41
2013-11-14 14:40:23 -06:00
Lee Venable
84de0beae4
Merge "Issue #2540 - pure python module merge implementation" into development
...
Former-commit-id: d431f3c0f4
[formerly d431f3c0f4
[formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]
Former-commit-id: bc7f5e556d
Former-commit-id: 17fef206fc
2013-11-14 14:33:18 -06:00
Richard Peter
ace2a71092
Merge "Issue #2505 removed recco from deployment" into development
...
Former-commit-id: 4d18c7d493
[formerly 4d18c7d493
[formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]
Former-commit-id: 3f5c590c5f
Former-commit-id: 3dc0ad184c
2013-11-14 13:30:09 -06:00
Nate Jensen
e83a828209
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: 9acda0b9f2
[formerly 9acda0b9f2
[formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]
Former-commit-id: c5cf68cc45
Former-commit-id: a6be904c69
2013-11-14 13:29:30 -06:00
Bryan Kowal
79045d620b
Issue #2540 - pure python module merge implementation
...
Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge
Amend: remove module merge exception catching
Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1
Former-commit-id: 2029c34f24
[formerly 2029c34f24
[formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]
Former-commit-id: 7e35ea310f
Former-commit-id: a2261b9ff3
2013-11-14 11:57:11 -06:00
Steve Harris
39e8f5ecc1
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 473488f5b8
[formerly 473488f5b8
[formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]
Former-commit-id: 4d25eb11c8
Former-commit-id: ef852ac125
2013-11-13 23:20:18 -06:00