Max Schenkelberg
8a238d9c64
Issue #2190 Sped up viirs map projection for use with nucaps cloud height
...
Change-Id: I7a99e734b9aede618f3afe7e01f3103f92c3fa52
Former-commit-id: 5169afc30f
[formerly 5169afc30f
[formerly 3bc32de5b1029287403173cc97d815e018a4531e]]
Former-commit-id: 8c26afa091
Former-commit-id: 3425c21404
2013-08-28 09:31:14 -05:00
Nate Jensen
35b6dbdd27
Merge "Issue #2262 Port ept to java." into development
...
Former-commit-id: 963967887f
[formerly 963967887f
[formerly 9d54442e8c175488857ed0540b4ed381949503e0]]
Former-commit-id: d7932c9288
Former-commit-id: e8abace394
2013-08-27 09:17:45 -05:00
Ben Steffensmeier
a444860b90
Issue #2262 Port ept to java.
...
Former-commit-id: fe739a6018
[formerly fe739a6018
[formerly a11ef952b6a7cf3135e07fa3161662783df37f74]]
Former-commit-id: b6a8c63cff
Former-commit-id: 969c467922
2013-08-26 16:35:30 -05:00
Nate Jensen
da2af552bd
Merge "Issue #2250 add array functionality checking to JUtil" into development
...
Former-commit-id: e214710122
[formerly e214710122
[formerly 96ba088c29bf105688fbcad5bdfa620cf1875b14]]
Former-commit-id: 796bd10c81
Former-commit-id: 790017b753
2013-08-26 13:04:21 -05:00
Matt Nash
4711ac7a66
Issue #2250 add array functionality checking to JUtil
...
Change-Id: Iffb4ba9dedd23641de82d99550e2b0473f4a5d23
Former-commit-id: 57681b27b9
[formerly 57681b27b9
[formerly a09ef5f2bad2a83394ec9a5f0dbb2edd4df0b961]]
Former-commit-id: 2ed6658f4a
Former-commit-id: 60547123d8
2013-08-26 12:58:58 -05:00
Mike Duff
e679055958
Issue #2180 - Pass messages back to CAVE
...
Change-Id: Ia5b88d577fc51b449a77389354e14808515e67bc
Former-commit-id: 20e6396c48
[formerly 20e6396c48
[formerly 37de8f85f870ca494e5a641967f544e359df77b9]]
Former-commit-id: 5f462ebf6f
Former-commit-id: 70b186d19a
2013-08-23 13:47:26 -05:00
Richard Peter
1a3e6b7501
Merge "Issue #2289 Speed up cape calculations. Change-Id: I56f2373779b2973a145b62c4f47b278458fd2d47" into development
...
Former-commit-id: 397b5123cb
[formerly 397b5123cb
[formerly 53faa91d53be5f71f6d0bee2174ec50fc41405a9]]
Former-commit-id: 91a5f2b669
Former-commit-id: ded4514e9d
2013-08-23 11:23:25 -05:00
Ben Steffensmeier
67a94befed
Issue #2289 Speed up cape calculations.
...
Change-Id: I56f2373779b2973a145b62c4f47b278458fd2d47
Former-commit-id: ce16be3666
[formerly ce16be3666
[formerly 1120ff36f2b0906445950fabbeb0b7429865c0b2]]
Former-commit-id: d2c848e202
Former-commit-id: 56067a38f8
2013-08-22 18:39:39 -05:00
Nate Jensen
ba18d77b45
Issue #2262 port scaleless_analysis to java
...
Change-Id: If59be97230f243859c02d7de6117bc9ed6c6b4af
Former-commit-id: 1c54f1ec82
[formerly 1c54f1ec82
[formerly 68a70c091203c74f33dc17ff31c3707c2c4c2a5a]]
Former-commit-id: 0e227df511
Former-commit-id: cc8cc61db5
2013-08-22 14:50:54 -05:00
Richard Peter
e77c439ef7
Merge "Issue #1693 Fixing dependencies" into development
...
Former-commit-id: 1b223090e7
[formerly 1b223090e7
[formerly 9e6402a60994f17f3c8e61a2fc5ee3397c9f8da6]]
Former-commit-id: 1d2c4ea875
Former-commit-id: 61a042cf41
2013-08-21 16:33:22 -05:00
Benjamin Phillippe
b79a414f7d
Issue #1693 Fixing dependencies
...
Change-Id: Id62a593dfa9b3d6c09e998689f199d980dda0ed9
Former-commit-id: 0d8adcade1
[formerly 0d8adcade1
[formerly 73c647449e071c9290c7b7fa57e99490960be536]]
Former-commit-id: 2f0949aa0a
Former-commit-id: 1561652425
2013-08-21 16:28:49 -05:00
Richard Peter
921c379a28
Merge "Issue #1693 Fixing build again" into development
...
Former-commit-id: 4c47f74b91
[formerly 4c47f74b91
[formerly e9b7e645b418e855e4ab14ba0c3fa35de545147b]]
Former-commit-id: cecd9a88e2
Former-commit-id: 9d4f18f978
2013-08-21 15:56:09 -05:00
Benjamin Phillippe
bb2f932a87
Issue #1693 Fixing build again
...
Change-Id: I6af71ab102b13a0bc0ecefc794cbdf69742d935f
Former-commit-id: b74eda779e
[formerly b74eda779e
[formerly dbe29fbcec7e9e444113471806f19c83a4b6c5c5]]
Former-commit-id: c3308766ee
Former-commit-id: 2ca4a747bf
2013-08-21 15:55:04 -05:00
Richard Peter
926e523d61
Merge "Issue #1571 Refactored GFE to store GridParmInfo and ParmStorageInfo in PostGres" into development
...
Former-commit-id: 02442e8fba
[formerly 02442e8fba
[formerly 2d79cbb93508d5c7f3a16fc4774c34deaa07923b]]
Former-commit-id: b6ed64f7bc
Former-commit-id: 53d8483087
2013-08-21 14:18:08 -05:00
Mike Duff
5a89b10d4b
Issue #1848 - Don't show create shared subscription denied message on create sub when user doesn't have the create shared sub permission
...
Fix for cave startup
Change-Id: Ic5040a0bf89273669cc450370c4d858072df0dd8
Former-commit-id: 77e2d04073
[formerly 77e2d04073
[formerly 43a3349eda74743ccbccbef2e04bf80a54beba24]]
Former-commit-id: 158b0f8564
Former-commit-id: 7228b3cf71
2013-08-21 13:46:55 -05:00
Benjamin Phillippe
a88418d24a
Issue #1693 Fixing dependencies
...
Change-Id: I2e502e5ec97f94c316b534933f69285703b23a7e
Former-commit-id: d7031d9c76
[formerly d7031d9c76
[formerly ab7af11f1a230cca095872751abfe7fb29c4500e]]
Former-commit-id: 087159b954
Former-commit-id: 384c70d990
2013-08-21 13:32:17 -05:00
Benjamin Phillippe
39cb869886
Issue #1693 Fixed plugin dependency
...
Change-Id: I4633ee50d696961d3166203d3a155a9688c62fb6
Former-commit-id: db9c0af3a6
[formerly db9c0af3a6
[formerly f8cbd960929249c4d711b54699fb7c7d973399f9]]
Former-commit-id: 416419bd27
Former-commit-id: e5d3df9631
2013-08-21 12:50:57 -05:00
Ron Anderson
fd059166c0
Merge "Issue #2280 Fix plugin purging" into development
...
Former-commit-id: 788a181336
[formerly 788a181336
[formerly c52535a68ed4251527e54590319f2a5bf5baea72]]
Former-commit-id: 9ad6ca2c98
Former-commit-id: 04e6ab0dc3
2013-08-21 11:49:17 -05:00
Dave Hladky
d0d2efd52f
Issue #2280 Fix plugin purging
...
Former-commit-id: 35b9b81e86
[formerly 35b9b81e86
[formerly 7678e5a7b42b704ed531197291c1de5a7f2d14de]]
Former-commit-id: 8b80ed7ae1
Former-commit-id: c18fa655ff
2013-08-21 11:45:25 -05:00
Richard Peter
ed484de618
Merge "Issue #2280 Fix plugin purging" into development
...
Former-commit-id: 317cd3417e
[formerly 317cd3417e
[formerly 17ec421694428d148db6744e288b0b5c44b66aed]]
Former-commit-id: 38b983f09e
Former-commit-id: 05819e8491
2013-08-21 11:29:54 -05:00
Ben Steffensmeier
20a11ff999
Issue #2259 Restore WxMath functionality used by popup skewT.
...
Change-Id: Ibfb2d2fda05ad0f03d8e708e18d2b93b4914e7d2
Former-commit-id: d10a32ffa0
[formerly d10a32ffa0
[formerly c3aa2c78243afcfa02c0988b16cf6640e35e73dc]]
Former-commit-id: 25be2a014c
Former-commit-id: 3697dd958a
2013-08-21 11:27:50 -05:00
Ben Steffensmeier
796b2e8e6c
Issue #2259 Delete old skewt plugin.
...
Change-Id: I41bd0e2268c5024ea88215683c4ecb12530ebd0d
Former-commit-id: e66bf7ce93
[formerly e66bf7ce93
[formerly 6f28d04b100001530afd17df69b87a6ac5a6407d]]
Former-commit-id: 3741068984
Former-commit-id: 8eaa12c9db
2013-08-20 17:57:06 -05:00
Ron Anderson
ddf03d171e
Issue #1571 Refactored GFE to store GridParmInfo and ParmStorageInfo in PostGres
...
Change-Id: Iae7cf49fc18abf03ef3b0ee498fb8e658f37d1cf
Former-commit-id: 04d2fdc214
[formerly 04d2fdc214
[formerly 3094dc247a6de94ff00321d093b431e3f401b0c5]]
Former-commit-id: 5aee6f35ff
Former-commit-id: f0fb2391af
2013-08-20 17:16:21 -05:00
Dave Hladky
c1c58dba44
Issue #2280 Fix plugin purging
...
Former-commit-id: b0eeafe7d4
[formerly b0eeafe7d4
[formerly 12aa32056e70d27aee62935ed7057812bd8107ef]]
Former-commit-id: 4a10a699a9
Former-commit-id: cf922cdefa
2013-08-20 16:18:23 -05:00
Nate Jensen
81d07dfaf6
Merge "Issue #2250 resolve some ffmp data factory issues and make some changes to failing function calls in FFMP, and handle new types of objects in JUtil" into development
...
Former-commit-id: 8d01eefc50
[formerly 8d01eefc50
[formerly 811924693ef44e87aae65a33c8decd1a7f1cd321]]
Former-commit-id: 6941e3300b
Former-commit-id: 599642edf5
2013-08-20 14:49:24 -05:00
Matt Nash
e345fbaa6b
Issue #2250 resolve some ffmp data factory issues and make some changes to failing function calls in FFMP, and handle new types of objects in JUtil
...
Change-Id: If6b33d542e2a0c2744e6c906d98273f589694772
Former-commit-id: 4c8e631e22
[formerly 4c8e631e22
[formerly 8916efbaad066e1b5dc6d01b68fa67c72ebc982b]]
Former-commit-id: 304ef3e3b8
Former-commit-id: b2b6246ead
2013-08-20 12:10:19 -05:00
Roger Ferrel
6f9c9d752d
Issue #2220 Better response using priority queues and delay getting display data.
...
Change-Id: I5f7b8eb904dcde9ef52acc2f39df864ac62080bb
Former-commit-id: 23bfd136b2
[formerly 23bfd136b2
[formerly 41b9f80efe66151a16b0df5b74ccc2904ac19e20]]
Former-commit-id: c626f25565
Former-commit-id: 62563c8b7b
2013-08-20 11:55:19 -05:00
Richard Peter
b258da63c1
Merge "Issue #2196 Renamed ncfRegistry.sh to centralRegistry.sh and wfoRegistry.sh to registry.sh to correspend to the modes.xml names." into development
...
Former-commit-id: 02131eecb0
[formerly 02131eecb0
[formerly 4003a61f0b6ea56f31dcf6cf1be7ee16f70860be]]
Former-commit-id: 36c486ca0a
Former-commit-id: 83eaf3f5fc
2013-08-20 11:37:28 -05:00
Richard Peter
3459527089
Merge "Issue #1692 Implemented/Verified Registry LifecycleManager - Verified submitObjects protocol - Added unimplemented features of removeObjects protocol - Implemented updateObjects protocol - Refactored registry error reporting - Fixed JUnit tests - Corrected @XmlRootElement tag on registry objects - Added capability to modify registry objects using XPath" into development
...
Former-commit-id: 544504b029
[formerly 544504b029
[formerly 95d945ad9fdfaf4a18d2fb6d9dd63b1314e95c8c]]
Former-commit-id: afc8e8823f
Former-commit-id: 194604aa24
2013-08-20 11:02:43 -05:00
Richard Peter
3443f1803b
Merge "Issue #1654 added Adhoc and SubscriptionRequestEvent. Added AdhocDataRetrievalEvent." into development
...
Former-commit-id: 3f68e90b92
[formerly 3f68e90b92
[formerly d18c660b2b9d1f9c679118ca46be45c69d76aea7]]
Former-commit-id: fed1365d50
Former-commit-id: 75bdec15f2
2013-08-20 11:01:05 -05:00
Brad Gonzales
a714dc6aba
Issue #2196 Renamed ncfRegistry.sh to centralRegistry.sh and wfoRegistry.sh
...
to registry.sh to correspend to the modes.xml names.
Change-Id: Ia07b046016e522089002440b4162de8370ee5343
Former-commit-id: 6a98f66353
[formerly 6a98f66353
[formerly 17f72768dbee4239238c77d21a35a07c21824e88]]
Former-commit-id: 6f7eb373d4
Former-commit-id: aa63997a17
2013-08-19 16:56:09 -05:00
Lee Venable
cd7b1fdc0a
Merge "Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog Peer review comments" into development
...
Former-commit-id: b8d050a172
[formerly b8d050a172
[formerly cb230698c8be8faef2441171f2270e41807f797d]]
Former-commit-id: 6f1e633d57
Former-commit-id: e1b9d4cf81
2013-08-19 15:14:22 -05:00
Benjamin Phillippe
f2889110a7
Issue #1692 Implemented/Verified Registry LifecycleManager
...
- Verified submitObjects protocol
- Added unimplemented features of removeObjects protocol
- Implemented updateObjects protocol
- Refactored registry error reporting
- Fixed JUnit tests
- Corrected @XmlRootElement tag on registry objects
- Added capability to modify registry objects using XPath
Change-Id: Id8eea47c3c4a1e39fe88cb17530e9e6cdacd7ce2
Former-commit-id: 2403f75262
[formerly 2403f75262
[formerly 94810246b449c64457c48684df72baf6e9e8b03d]]
Former-commit-id: 1390bd8a65
Former-commit-id: d9dffafa6f
2013-08-19 13:16:13 -05:00
Bryan Kowal
6f246409fd
Issue #2169 - gzip data uris; entities that receive data uris will unzip them before running thrift conversions.
...
- Amend: updates for 32-bit edex_com
- Amend: do not synchronize when building the message
- Amend: use the byte array pool
- Amend: default to data decompression when the queue is edex.alerts
Change-Id: I79a1f3d3d698c67019a4aa33e667fef99f6ebc17
Former-commit-id: 3eaacdb522
[formerly 3eaacdb522
[formerly 120aa0d6ee671e20734f8efb7bad89ff1b145629]]
Former-commit-id: 2e1a8eb2b3
Former-commit-id: 5c0af47d6d
2013-08-19 12:06:30 -05:00
Richard Peter
c15214630c
Merge "Issue #1742 Fixed concurrent mod exception in DAT config updates Change-Id: I78ddb871e2bdc3c4200d9c32ae5d9fbd729f116e" into development
...
Former-commit-id: e5b6102791
[formerly e5b6102791
[formerly 7988827cf78516d2b928db9004cec0ab5bebd08e]]
Former-commit-id: 39a56abb39
Former-commit-id: 2258c4cee1
2013-08-19 10:10:38 -05:00
Dave Hladky
a7de983a1c
Issue #1742 Fixed concurrent mod exception in DAT config updates
...
Change-Id: I78ddb871e2bdc3c4200d9c32ae5d9fbd729f116e
Former-commit-id: 111ffab3c9
[formerly 111ffab3c9
[formerly 8f3cbb79c086845d49b7a877359cac3f83fc1c1c]]
Former-commit-id: 6d9872d694
Former-commit-id: 2702279e7a
2013-08-16 16:26:19 -05:00
Mike Duff
f22684b90b
Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog
...
Peer review comments
Change-Id: I4b2eef5a0d0697e2f94aa7c59872c73cb3b350b0
Former-commit-id: 70af70ba8d
[formerly 70af70ba8d
[formerly 938c6d3151fc5b7513ee48fe9e9de0c60e7799a8]]
Former-commit-id: 6190281e77
Former-commit-id: c4c73b4e3b
2013-08-16 13:13:02 -05:00
Everett Kladstrup
08bbf8620a
Issue #2240 Fix incorrect environment assumptions
...
* using $awips_home as the prefix for java/python/psql causes
problems on edex-environment (wes2bridge) installs; where
$awips_home does not contain the java/python/psql installs, instead
they are located at /awips2
Change-Id: Iadfe6c2b2ca1a1d9e55bb9cfc73ed6042e6fdcee
Former-commit-id: 535248b69b
[formerly 535248b69b
[formerly d7f3cd19c3f2697b139e3d36ac7ee536947a2b6f]]
Former-commit-id: fba53e9fe3
Former-commit-id: 6883cdc389
2013-08-16 11:02:15 -05:00
Nate Jensen
bca8f9f3ca
Merge "Issue #2260 Switch poessounding to NSharp. Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78" into development
...
Former-commit-id: 469df6d806
[formerly 469df6d806
[formerly 2f69b0b239a292711ed6b40a1348d357f65bdc67]]
Former-commit-id: d28cb1ff68
Former-commit-id: b34d67ced3
2013-08-16 10:06:32 -05:00
Richard Peter
b8bf91e9af
Merge "Issue #2196 final name change for registries. Now registry and centralRegistry." into development
...
Former-commit-id: ae1d4ca6b4
[formerly ae1d4ca6b4
[formerly e9dc49bfac807b7ddbe2a6ac39e13eb917aacf44]]
Former-commit-id: ea98de5ad1
Former-commit-id: 8f12009352
2013-08-16 09:41:08 -05:00
Ben Steffensmeier
e24647553f
Issue #2260 Switch poessounding to NSharp.
...
Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78
Former-commit-id: 36a920333f
[formerly 36a920333f
[formerly 4e83b721a46cea5af56fd2444ba4bf22813604e9]]
Former-commit-id: 74b0b57f4b
Former-commit-id: 94e79ff7b4
2013-08-15 17:51:52 -05:00
Brad Gonzales
9c63e17a83
Issue #2196 final name change for registries. Now registry and centralRegistry.
...
Change-Id: I172aa9918c2281fa2923503eeb067954e4bf955f
Former-commit-id: 2279d03112
[formerly 2279d03112
[formerly f5a61ca98bc2da6bb69ef6f78fe40e390bfab45f]]
Former-commit-id: 705d4660cc
Former-commit-id: cf77bb12b7
2013-08-15 14:57:53 -05:00
Max Schenkelberg
451eb54a36
Issue #2033 moved avnfps and text workstation files into respective plugins.
...
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2
Former-commit-id: 6f60751ec6
[formerly 6f60751ec6
[formerly 77e1a4d8f5237e5fae930c1e00589c752f8b3738]]
Former-commit-id: c5575f9624
Former-commit-id: 8de539020d
2013-08-15 12:21:43 -05:00
Ben Steffensmeier
5a6ad9b554
Issue #2259 fix units for goes point data pressure
...
Former-commit-id: 2171c10e9e
[formerly 2171c10e9e
[formerly 411c30dc9a5396ade5af03294cad612472e8060b]]
Former-commit-id: 984c5f2684
Former-commit-id: fff0ce30ae
2013-08-15 12:02:24 -05:00
David Gillingham
f46f62ff2e
Issue #2262 : Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into
...
Java. Convert to use of these new methods where possible. Create unit tests.
Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d
Former-commit-id: 0b6b0e06cc
[formerly 0b6b0e06cc
[formerly 5992197809236553e9c021526e42d28ed327b413]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 8d347252d2
2013-08-15 11:30:45 -05:00
Brad Gonzales
4d4f281553
Issue #1654 added Adhoc and SubscriptionRequestEvent. Added AdhocDataRetrievalEvent.
...
Amend: Added constructor to RegistryStatisticsEvent that takes a count parameter
and other recommendations from peer review. Removed count attribute
from RegistryStatisticsEvent. Changed construction of SubsriptionRequestEvents
to set numRecords attribute.
Change-Id: Ib7595b9098299aedeae9db0ca02250551848c3e2
Former-commit-id: d2dac35b65
[formerly d2dac35b65
[formerly 818688266a32feec2081f0c6e74a37e431df9435]]
Former-commit-id: 64c6e5abff
Former-commit-id: 84e14a5a62
2013-08-15 09:35:10 -05:00
Richard Peter
b09a191bfc
Issue #2214 : Fix merge issue with gfe-spring.xml
...
Former-commit-id: eb8805e51c
[formerly eb8805e51c
[formerly 346de47492d79ea1a2605fa3a02bc5058f2b8e9e]]
Former-commit-id: dad1b6fb45
Former-commit-id: c799d73430
2013-08-14 18:32:39 -05:00
Richard Peter
9cf5e247ab
Merge branch 'omaha_13.5.1' (13.5.1-15) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
Former-commit-id: 5e5047cc4f
[formerly 5e5047cc4f
[formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]
Former-commit-id: 2a9276c728
Former-commit-id: db7c941f6f
2013-08-14 15:23:18 -05:00
Richard Peter
7ca1edf371
Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: c61afa1bfa
[formerly c61afa1bfa
[formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 58a4aaa080
2013-08-14 14:29:55 -05:00
Brad Gonzales
526c244fc5
Issue #2196 changed ncfRegistry.sh EBXML_THRIFT_SERVICE_PORT to correspond to the port that the DPA looks for.
...
Renamed registry mode to wfoRegistry mode. Renamed devWfoRegistry mode to devRegistry mode.
Change-Id: I8793b2a5c6ebf0f2ce342103e81d48de1b3e2044
Former-commit-id: 533deffd53
[formerly 533deffd53
[formerly b4ee9c5753571a8cdd0720986c76723f4e646f0c]]
Former-commit-id: 5d169e4df1
Former-commit-id: f3bc3d9185
2013-08-14 12:35:18 -05:00