xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4198 commits 31 branches 40 tags 3.8 GiB
Commit graph

210 commits

Author SHA1 Message Date
Dave Hladky
86363574b3 Issue #2542 Jetty upgraded 
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: 643a150777 [formerly 643a150777 [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]
Former-commit-id: e3a259182c
Former-commit-id: 53866e481a
 2013-11-12 14:55:41 -06:00
Brad Gonzales
f017bee2f2 Issue #2506 fixed issues with shared distributed ingest. 
Amend: Updated comment in StoreRetrievedData.
       Removed separate messageing to clear BandwidthSubscriptions.
       Add fix and test case for SBN deserialization with content following the ending xml tag.
       Removed unneeded changes.
       Added XmlWMOMessage class.

Change-Id: Iadef7070a42a10661ba9316a4900a071820296fd

Former-commit-id: fe15e874f7 [formerly fe15e874f7 [formerly 0b667fbd94788a8a5b598ae5f5586d4b710518a4]]
Former-commit-id: e2fb158757
Former-commit-id: 28d8aa5151
 2013-11-08 15:29:05 -06:00
Mike Duff
70fbb031a2 Issue #2450 - Send notifications to Notification Center when subscriptions expire. 
peer review comments

Change-Id: I18eb322d73ee25f30cd1d032b403ea156bc63653

Former-commit-id: 00bb57b481 [formerly 00bb57b481 [formerly fc6fe49db0576c70e2068cd8fac125553806e4c0]]
Former-commit-id: f3d07a9185
Former-commit-id: cc3846be0b
 2013-11-06 12:23:09 -06:00
Benjamin Phillippe
73c53ed846 Issue #1538 Moved data delivery specific web services out of registry plugins 
-- Added registry federation admin page
            -- Made registry service clients non-static

Change-Id: I9672f11b4886019dcd8834b4bae417a0aa4809ad

Former-commit-id: a7e53870fb [formerly a7e53870fb [formerly 0a67c8d68548ed8daa76d782ca3213956b984795]]
Former-commit-id: d8de923f8b
Former-commit-id: 221d197c01
 2013-11-01 09:20:00 -05:00
Dave Hladky
85003bf022 Issue #2448 Fixed retrievals before activePeriod begins and after activePeriod expires. 
Change-Id: I75269bad24731990720d30683ebf5f27344661f3

Former-commit-id: 4227f3a59f [formerly 4227f3a59f [formerly 060e719f27c20f24bae9a5603cc51d90434b8fa4]]
Former-commit-id: 9161962813
Former-commit-id: d55d68fe5a
 2013-11-01 08:23:16 -05:00
Richard Peter
300f907c46 Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development 
Former-commit-id: 3139055873 [formerly 3139055873 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]
Former-commit-id: b482eb2b48
Former-commit-id: 73462fa134
 2013-10-31 11:46:25 -05:00
Mike Duff
26ca1b4d72 Issue #2292 - refactor and move overlap/duplicate checks to edex. 
Peer review comments

Change-Id: I33df9cc7e368778943e25420d18b343781304c7a

Former-commit-id: f123fa11f5 [formerly f123fa11f5 [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]
Former-commit-id: 3fc811102e
Former-commit-id: 4da0648461
 2013-10-31 09:22:50 -05:00
Nate Jensen
68658bf885 Merge "Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code" into development 
Former-commit-id: d92bd5b69a [formerly d92bd5b69a [formerly 05de1d88cdc4841483864a623346ad16b015d395]]
Former-commit-id: 62a5739feb
Former-commit-id: 5c4d8b4310
 2013-10-30 11:28:58 -05:00
Brad Gonzales
3b2127c103 Issue #2267 Remove java.nio.file dependencies from the SbnSimulator. Fixed handler setting for UFStatus in test env. 
Change-Id: I8245eef53573b6596546e17a7900a1538455cee2

Former-commit-id: f1480cfc62 [formerly f1480cfc62 [formerly 6b8ff162be029543c8b9a7fcb3f8a359962aa6d7]]
Former-commit-id: 6bc585aaf6
Former-commit-id: aeccaa2329
 2013-10-29 15:10:20 -05:00
Nate Jensen
e8c199f108 Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code 
Former-commit-id: f3143ba7b4 [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]
Former-commit-id: 6880a18f1a
Former-commit-id: f2751f017e
 2013-10-29 14:33:53 -05:00
Brad Gonzales
9215426279 Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs 
on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box.

Amend: Added excludes to sbnSimulator modes.
       Updated FileUtil.listPaths to close the stream and use a LinkedList.
       Added additional logging to SbnSimulator.

Change-Id: I89ff7d4afdd18ba51b8fd4812bb0b871ffc6d3af

Former-commit-id: bd7e5d8940 [formerly bd7e5d8940 [formerly f9e593974811896dec76c512c2a76b5769c7a68a]]
Former-commit-id: f7a635ebef
Former-commit-id: c36cbae577
 2013-10-23 18:44:41 -05:00
Benjamin Phillippe
e3796d0149 Issue #1682 Fixed replication/query errors and added synchronous notification delivery 
Change-Id: Ia6a07c3abf6c48ef18d354dc2866ed981e6f1478

Former-commit-id: 64b0a4d065 [formerly 64b0a4d065 [formerly 2f6dc771e86cf290bb72743f1855f02c616e57d5]]
Former-commit-id: d94f22fda8
Former-commit-id: 9153069a87
 2013-10-20 16:02:10 -05:00
Benjamin Phillippe
63e7a68c79 Issue #1682 Refactored Registry querying to conform to EBXML 4.0 spec 
Change-Id: If6d3579305afbb279057a264033736fc126b7849

Former-commit-id: a4e5cd5fd7 [formerly a4e5cd5fd7 [formerly 5112ee9931a1678fee37dd725a28dd6fff1e7ec9]]
Former-commit-id: ed23a786d6
Former-commit-id: a51d2fe3b9
 2013-10-18 09:20:40 -05:00
Ben Steffensmeier
2b831863c5 Issue #2473 Remove deprecated grib functionality 
Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23

Former-commit-id: cfc8bb859f [formerly cfc8bb859f [formerly 9d903e94114cacee2a6abec6f83880fa8b978180]]
Former-commit-id: 94560e37c8
Former-commit-id: 2e0698aa06
 2013-10-15 10:48:29 -05:00
Mike Duff
ffbbf04f05 Issue #2386 - DD Front end refactor 
Peer review comments
Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f

Former-commit-id: 33a5d36e1c [formerly 33a5d36e1c [formerly a72c1f9ad09594ddc0c0e78e78c9fccd95fd49ff]]
Former-commit-id: 83ec4daee2
Former-commit-id: 4764147f67
 2013-10-14 15:42:28 -05:00
Brad Gonzales
32dce367a9 Issue #1797 Refactored registry Time objects to simplify serialization issues. 
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
       Fix GriddedTime addCycles when cycles are empty.

Change-Id: I9fa27178e5f59252cb872314493256be7f038890

Former-commit-id: 25710edd9e [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]
Former-commit-id: bc87f2a168
Former-commit-id: 897fdfc2f6
 2013-10-11 10:36:53 -05:00
Brad Gonzales
b24299e301 Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes. 
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30

Former-commit-id: 73e757c284 [formerly 73e757c284 [formerly f776626738e4cc995bb16e87b8da66ff90289bd8]]
Former-commit-id: 61448cc04a
Former-commit-id: 55d242b86d
 2013-10-09 17:58:12 -05:00
Dave Hladky
7807722694 Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects 
Former-commit-id: fbe4078bc5 [formerly fbe4078bc5 [formerly c299ed7a5bb02980ecb30b0ab38752d2878d50a7]]
Former-commit-id: ad1bb73c70
Former-commit-id: 093b41499b
 2013-10-08 10:25:36 -05:00
Brad Gonzales
0f3b5172d4 Issue #2267 Shared Subscription fixes. DataDelivery Port environment standardization. Logging updates. 
Amend: Refactored WMO header applier.
       Fixes for WMO header applier.
       Updated dataDeliveryRetrieval.xml with correct wmo header pattern.
       Removed manual ingest from registry mode.
       Simplified data delivery distribution matching pattern.
       Added serialize test for wfs response.
       Updated comments.
       Moved WfsRetrievalResponse to com.raytheon.uf.edex.datadelivery.retrieval package.
       Added WfsRetrievalResponse to Jaxb unmarshalable classes in DeserializeRetrievedDataFromIngest.
       HibernateBandwidthInitializer.executeAfterRegistryInit(), in NCF mode schedules shared subs.

Change-Id: I0278339701f5f55491120c35d80cbd6d3dcc84f7

Former-commit-id: 21acb75f24 [formerly 21acb75f24 [formerly 8bf8efa14520aaba532ca7a2e82e4c1fa24adca8]]
Former-commit-id: a6540d69ea
Former-commit-id: 9d981ab2f3
 2013-10-07 17:06:38 -05:00
Richard Peter
7ef56bfc43 Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development 
Former-commit-id: 2e062048e1 [formerly 2e062048e1 [formerly 204c2034a08cd69fc7286639f37e5ff936ecf49e]]
Former-commit-id: e2c7bb21d7
Former-commit-id: e43cd4b397
 2013-10-07 16:19:11 -05:00
Dave Hladky
3ba8fd56f7 Issue #1797 Separation of gridded time and abstract time object 
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63

Former-commit-id: e0ec10d073 [formerly e0ec10d073 [formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]]
Former-commit-id: 1733834e74
Former-commit-id: 89c341509c
 2013-10-04 10:36:27 -05:00
Mike Duff
076da5b3f3 Issue #2296 - Change email recipients of unit test failure email. 
Change-Id: I17338a82fd97a12eaafc1b64a91ebe35de1fb270

Former-commit-id: 7072b53ba5 [formerly 7072b53ba5 [formerly 466b16f5052e3a848980976cfbdcf5dff95673c9]]
Former-commit-id: 77c2043a1a
Former-commit-id: 229637bf7a
 2013-10-02 09:54:16 -05:00
Dave Hladky
5672fc86c9 Issue #2386 Backend work for adding multiple types to Subscription overlap rules 
Change-Id: I0779dc7987031999b80ab0859c7f33dca20a5c17

Former-commit-id: d34882eb49 [formerly d34882eb49 [formerly 449c584afc46257671808b921847a621e7020bcf]]
Former-commit-id: e29d10ba4f
Former-commit-id: d9f06e5bea
 2013-09-26 11:12:00 -05:00
Brad Gonzales
164edd9420 Issue #2397 Added Bandwidth Bucket usage information to BandwidthGraphData. 
Change-Id: I13a859ebc341ad9d1aaf9a31e94cf4783df761ce

Former-commit-id: bb27130374 [formerly bb27130374 [formerly c7389871fca42adf4cb3ec1c37e0fdffd56f2a43]]
Former-commit-id: fd8be3f23f
Former-commit-id: 9902cd7c2b
 2013-09-23 12:45:13 -05:00
Brad Gonzales
3ca693fb89 Issue #2383 Updates to fix issues with adhoc point queries and bandwith manager tests. 
Amend:  Reverted BandwidthDaoUtil.setAdhocMostRecentUrlAndTime to Dave's fixes, with one
        minor change.  Added additional handling to start and end bucket calculation in
        InMemoryBandwidthBucketDao.  Addtional logging.  Removed exception logging of
        subscriptions.

Change-Id: Ie51c0accd7f39d31379e49e97542bae75bde5a1c

Former-commit-id: c81825ce57 [formerly c81825ce57 [formerly 148cc6d96ed17127590827d166325c4748384689]]
Former-commit-id: d597d7f653
Former-commit-id: 6ddb913829
 2013-09-19 12:54:31 -05:00
David Gillingham
a9c59c0a1e Issue #2033: Move GFE-specific localization files and other misc. code out of 
build.cave project and into viz.gfe project.

Change-Id: Ic51275064f92a9cf50a15c2fff647b73f0839375

Former-commit-id: b8c1bc39f6 [formerly b8c1bc39f6 [formerly cdb1ad6eee96d2b61d35d7d5d727336128827a1b]]
Former-commit-id: 64cde568ab
Former-commit-id: e311062ae2
 2013-09-16 12:50:04 -05:00
Ben Steffensmeier
4ccc511d91 Issue #2309 Fix envelope intersection for UKMET data on North American scale. 
Former-commit-id: 0c64f33213 [formerly 0c64f33213 [formerly 325a28c5793bacdeddba09a666f8beb4dafe92df]]
Former-commit-id: b2475e3982
Former-commit-id: 45db8fb699
 2013-09-13 15:00:50 -05:00
Dave Hladky
1348b91f27 Merge branch 'dd_pre_release_2.1' into development 
Former-commit-id: f1fc14ce90 [formerly f1fc14ce90 [formerly 076dd7338edcf45a33f6485f190831acd344b954]]
Former-commit-id: 329a40852c
Former-commit-id: b0b51dbcb6
 2013-09-11 15:07:23 -05:00
Nate Jensen
2cc6a54e61 Merge "Issue #2352 - Data Browser Must Check For Subscriptions Belonging to the Local Site" into dd_pre_release_2.1 
Former-commit-id: 83fc7113b1 [formerly 83fc7113b1 [formerly 89507c3f6e398f9068e75c3049266afd1ed034a2]]
Former-commit-id: d1f699bd51
Former-commit-id: 38dcc46cf6
 2013-09-11 11:55:10 -05:00
Mike Duff
ed8fa698dd Issue #2352 - Data Browser Must Check For Subscriptions Belonging to the Local Site 
Change-Id: I23392906a7d829852af2991dd096d4b5e76765aa

Former-commit-id: 89342e59b9 [formerly 89342e59b9 [formerly 5b4c9794eb396f02cdf024d2df2089add4719910]]
Former-commit-id: b8d2c6cffc
Former-commit-id: 13751ede70
 2013-09-11 09:47:04 -05:00
Brad Gonzales
da4b44cdc4 Issue #2344 Fixed HibernateBandwidthInitializerTest. 
Amend: Removed officeID change to BaseSubscriptionFixture.

Change-Id: Ib3065684aa88cdcde000239d9202d5d43259f43e

Former-commit-id: 695aa9e609 [formerly 695aa9e609 [formerly 69b7fc7281a4cc266b7e6ca6f0adff00b3658957]]
Former-commit-id: d0ccc11f58
Former-commit-id: 8fe9dd0435
 2013-09-09 13:11:18 -05:00
David Gillingham
c0f4022abd Issue #2307: Remove calls to PythonScript constructor without ClassLoader 
argument, fix IscMosaic.

Change-Id: Iff29b2790fd1c6d5f5b829f6b35ff31829cdc907

Former-commit-id: e526e7a82c [formerly e526e7a82c [formerly 85609a4bf9072ae41dbafbc1b874efbcd5bd21a4]]
Former-commit-id: 47878a4318
Former-commit-id: 28e5aaabca
 2013-09-06 10:16:31 -05:00
Ben Steffensmeier
e6b1e34f99 Issue #2316 Remove tests for old airep/pirep plugins. 
Change-Id: I5503e6bd065e4daa4620c35d0a173a7cbb5bfe44

Former-commit-id: b856f454ff [formerly b856f454ff [formerly 8d7e812f92c48fd57a52e79433de9f094f675fe3]]
Former-commit-id: e091a9d18d
Former-commit-id: f5246117a9
 2013-09-05 16:27:02 -05:00
Richard Peter
ea33eabfc5 Merge "Issue #2298: Make getPluginName abstract" into development 
Former-commit-id: 4b4f59ca37 [formerly 4b4f59ca37 [formerly 8111c47024fb284c31faf473037d6b401ff17e3a]]
Former-commit-id: 465d41c2e9
Former-commit-id: 62797681f1
 2013-09-03 12:32:30 -05:00
Richard Peter
beb492620b Issue #2298: Make getPluginName abstract 
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae

Former-commit-id: 592218edb8 [formerly 592218edb8 [formerly 54356ea774bfab26b85aff317fc759de41e259d1]]
Former-commit-id: 7175e78cf7
Former-commit-id: ae956e3b4b
 2013-09-03 11:51:27 -05:00
Roger Ferrel
9003605f86 Issue #2224 Unit test now handles different time types and configuation changes. 
Change-Id: I7f082b55ae112b1835ebdb516da85b2267e546e7

Former-commit-id: 539fc98c76 [formerly 539fc98c76 [formerly 7afd222c9c5d4293f977ceec1cb6356741844e79]]
Former-commit-id: 9c06a5eb40
Former-commit-id: 4c83ebed99
 2013-08-30 15:35:37 -05:00
Dave Hladky
6cef334d9a Issue #2098 Updates for WFS/DPA improvements 
Change-Id: Ia0d68d1faf5f4b9da8c8f683f459a1a3e5dac0cf

Former-commit-id: 0a45c77520 [formerly 0a45c77520 [formerly dc668631168388501efb8753ecb4cff8b9025456]]
Former-commit-id: ac4aeeec45
Former-commit-id: 36005754b5
 2013-08-30 12:57:31 -05:00
Roger Ferrel
70dc69d736 Issue #2299 fixed purger running ingest out of memory. 
Change-Id: If1877049574fd546e90479f3c56feb94ffbe088a

Former-commit-id: 25f896a26f [formerly 25f896a26f [formerly d544b6572fb2ad7a36308673eb0b61b9a7df0b53]]
Former-commit-id: 2e0095db69
Former-commit-id: dcdb56bbe5
 2013-08-29 16:33:04 -05:00
Ben Steffensmeier
89ff18193c Issue #2262 Delete meteolib. 
Former-commit-id: ffa79b8992 [formerly ffa79b8992 [formerly 125546e4da877fbb732b9fa40c68b08bc764f8e0]]
Former-commit-id: 0961408d40
Former-commit-id: e4a0bd5370
 2013-08-28 14:53:46 -05:00
Benjamin Phillippe
4634cadd3d Issue #1538 Federated registry fixes/modifications 
Change-Id: Iedc048fe42687bec17385f0aacf0af0141df2146

Former-commit-id: a96764e900 [formerly a96764e900 [formerly 05e0a84c1ef3d04256884b81219f643e8f38187d]]
Former-commit-id: b10ecfa19c
Former-commit-id: 283326197a
 2013-08-28 11:41:06 -05:00
Dave Hladky
30aa0c93a1 Issue #2097 Initial update for OGC services 
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99

Former-commit-id: 83dba7b655 [formerly 83dba7b655 [formerly 875006e24de0755cdd0dedc7b0afcf221bcbad49]]
Former-commit-id: bef4b3cdbd
Former-commit-id: 37062aac21
 2013-08-28 08:24:45 -05:00
Mike Duff
298ce969cc Issue #2296 - Moved TestScaleless to manual 
Change-Id: If9238a2d15b0affbe8bf969258c41c979da96e87

Former-commit-id: ac4f1baf87 [formerly ac4f1baf87 [formerly 03766f4406d4371803938bd584f4c046685e1739]]
Former-commit-id: 5af2689398
Former-commit-id: c497e26080
 2013-08-27 10:06:34 -05:00
Mike Duff
d82014fc59 Issue #2296 - fix the unit test build path 
Change-Id: I7a92739110379bf5de4abdd5ace041b6a0d340f6

Former-commit-id: 63dd51a2d5 [formerly 63dd51a2d5 [formerly 72d4651e21274e359fb222e18ae3ff5f9a47833d]]
Former-commit-id: 0977cb6b44
Former-commit-id: 97d31a7b06
 2013-08-27 09:24:21 -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
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
Lee Venable
4682461e95 Merge "Issue #1733 - Fix issue with moving items between selected and available in dual list, moved some test code to test project" into development 
Former-commit-id: e032ceb581 [formerly e032ceb581 [formerly b05489575d763ed896fcbd806850b92346ef0c00]]
Former-commit-id: 7c493b5562
Former-commit-id: c6a430d0e7
 2013-08-22 11:55:38 -05:00
Mike Duff
7545922e11 Issue #1733 - Fix issue with moving items between selected and available in dual list, moved some test code to test project 
Change-Id: Ic46ce9adabf8a922066c2a2d58596504e244332c

Former-commit-id: e3dc67e18d [formerly e3dc67e18d [formerly 8a14be26db146b44fd364b26a694c2531ec843a4]]
Former-commit-id: a7b6f116bd
Former-commit-id: 3b670ac95e
 2013-08-21 17:15:52 -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
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
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