Richard Peter
909571ebca
Issue #2726 : Edex graceful shutdown.
...
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: 17196b5dcd
[formerly dbba727f3d
[formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]
Former-commit-id: dbba727f3d
Former-commit-id: e4be1f24e7
2014-04-14 13:10:11 -05:00
Everett Kladstrup
eab1358602
Issue #2725 Move derived parameters logic to common
...
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
to the common hierarchy
* Move data cube classes that don't depend on derived parameters
to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
viz.core to viz.datacube
Former-commit-id: 0699041518
[formerly 06d6961c0f
[formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]
Former-commit-id: 06d6961c0f
Former-commit-id: 8b19b3601a
2014-04-09 09:31:12 -05:00
Nate Jensen
f0ef64f03c
Merge "Issue #2920 Allow strings to use mulitple styles." into development
...
Former-commit-id: 3fff4e77d4
[formerly 811364eb73
[formerly 1b07e87178947df4d579dbc32057e883b61a7de2]]
Former-commit-id: 811364eb73
Former-commit-id: b793ce20bc
2014-04-08 14:28:44 -05:00
Nate Jensen
0949264e48
Issue #2968 improve efficiency by only compressing/serializing persisted
...
objects once
Change-Id: Iba90717d049571b801254852a7fd5a73202701f2
Former-commit-id: aaf2d3c8a4
[formerly e3df98635a
[formerly a35a103be0818ec80c7e2d98a74782b8278b4383]]
Former-commit-id: e3df98635a
Former-commit-id: 579584c346
2014-04-08 12:59:16 -05:00
Ben Steffensmeier
72f68e9e2b
Issue #2920 Allow strings to use mulitple styles.
...
Former-commit-id: bb205cdef9
[formerly 32016d5401
[formerly ba3638effd48445bd00b8ef5e3771f05910c2af1]]
Former-commit-id: 32016d5401
Former-commit-id: ddc97933b8
2014-04-04 16:16:06 -05:00
Ben Steffensmeier
094086b5c2
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
...
Former-commit-id: 8650074737
[formerly 9122b6da99
[formerly ba5ff870337c7ac66d633077d84de867e5df967c]]
Former-commit-id: 9122b6da99
Former-commit-id: c0b478eb97
2014-03-07 18:15:32 -06:00
Nate Jensen
d0fd1154d4
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: 2eea0b9205
[formerly 59dcb3a97d
[formerly e108aa41bb586593f50970da53109a82d2bb8452]]
Former-commit-id: 59dcb3a97d
Former-commit-id: 54d015cb4f
2014-03-05 14:14:25 -06:00
Max Schenkelberg
1dad35e391
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: b5ed7ac361
[formerly 10bfa59aef
[formerly 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede]]
Former-commit-id: 10bfa59aef
Former-commit-id: 83ac37724e
2014-03-05 13:51:06 -06:00
Ben Steffensmeier
291d5f55df
Issue #2843 Harden recycle.
...
Former-commit-id: 3cd6b29e75
[formerly 26c1a8e494
[formerly 364b818dbd055b13fd8d5bb9f40c16f730f30b53]]
Former-commit-id: 26c1a8e494
Former-commit-id: 22adc336df
2014-03-05 11:16:12 -06:00
Richard Peter
83b99aad5c
Merge "Issue #2791 Use Data Source for all grid data access." into development
...
Former-commit-id: 873fa00fac
[formerly f87a913017
[formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]
Former-commit-id: f87a913017
Former-commit-id: 090829f75e
2014-03-04 12:43:17 -06:00
Nate Jensen
b0e727938b
Merge "Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done." into development
...
Former-commit-id: 7ac7dd5f01
[formerly f50a2789dd
[formerly 788133c5ea1a3005ed309a466e8cafad6db84ce3]]
Former-commit-id: f50a2789dd
Former-commit-id: 75611f0631
2014-03-04 10:55:05 -06:00
Max Schenkelberg
dbc6cc3fc6
Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
...
Amend: Added comments and cleaned up preference store
Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d
Former-commit-id: cbf8b9249c
[formerly a01a6d68d0
[formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]
Former-commit-id: a01a6d68d0
Former-commit-id: 59434c8a60
2014-03-04 09:23:36 -06:00
Max Schenkelberg
4bcdc9f85b
Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
...
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada
Former-commit-id: 1854bbb477
[formerly dbcbd1b560
[formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]
Former-commit-id: dbcbd1b560
Former-commit-id: 6edfb8965f
2014-03-03 17:59:48 -06:00
Nate Jensen
0044c21ad5
Issue #2792 enforce getDensity() will not return above max
...
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1
Former-commit-id: 22153d43bb
[formerly 384b531d26
[formerly a502a64219e869401b1bff82fbb73e67565a6dae]]
Former-commit-id: 384b531d26
Former-commit-id: 7f31e34dc9
2014-03-03 14:44:16 -06:00
Ben Steffensmeier
16b6723cbb
Issue #2791 Use Data Source for all grid data access.
...
Former-commit-id: 05770129c1
[formerly 6fa441396f
[formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]
Former-commit-id: 6fa441396f
Former-commit-id: 02cef4ddaa
2014-02-28 17:06:33 -06:00
Lee Venable
4631a29ca3
Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development
...
Former-commit-id: c77634951c
[formerly f171e3adb0
[formerly 1a72af70658f288d43e397d12499de1a08ff2ba8]]
Former-commit-id: f171e3adb0
Former-commit-id: 40f3df6aff
2014-02-28 13:50:15 -06:00
Mike Duff
512e634a97
Issue #2632 - Implement buddy pounce (Contact Notifiers)
...
Review comments
Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7
Former-commit-id: 5f433b4f6b
[formerly 5440ff64d1
[formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]
Former-commit-id: 5440ff64d1
Former-commit-id: 377c1f9998
2014-02-28 13:23:34 -06:00
Richard Peter
79d3aa4e1a
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 1c150e6e8b
[formerly 0e25ae35c1
[formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]
Former-commit-id: 0e25ae35c1
Former-commit-id: 7bd6a07913
2014-02-27 15:18:26 -06:00
Ben Steffensmeier
152980350c
Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
...
Former-commit-id: e08d4f77c3
[formerly 70ae372303
[formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]
Former-commit-id: 70ae372303
Former-commit-id: 780dc19fac
2014-02-21 17:37:19 -06:00
Matt Nash
1d6e1d443c
Issue #2761 add region level to localization
...
Amend : Change comment now that we do not get file from localization
Change-Id: I864f2b4e1c84261ada3bf6169dbd3389d9b61ae2
Former-commit-id: 1835019567
[formerly 2d20e84f6a
[formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]
Former-commit-id: 2d20e84f6a
Former-commit-id: 3f67324d7c
2014-02-19 10:01:25 -06:00
Nate Jensen
742217ded0
Issue #2704 fix alertviz connectivity checks
...
Former-commit-id: 4d68994525
[formerly 0c4de50218
[formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]
Former-commit-id: 0c4de50218
Former-commit-id: 0160ab0464
2014-02-17 17:10:07 -06:00
Nate Jensen
34c7c3cba1
Issue #2812 made getHostname() use getWsId().getHostname for consistency
...
and working on windows
Former-commit-id: 2486e39192
[formerly 15ff4ab5d7
[formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]
Former-commit-id: 15ff4ab5d7
Former-commit-id: c8e70cd6b1
2014-02-17 11:58:04 -06:00
Nate Jensen
24bbf4949d
Issue #2704 smarter thin client connectivity dialog and connection
...
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: fd43d9e095
[formerly 75ca70fba6
[formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]
Former-commit-id: 75ca70fba6
Former-commit-id: c28085118f
2014-02-10 16:48:29 -06:00
Ben Steffensmeier
e7baa5b186
Issue #2211 Fix data mapped sampling.
...
Former-commit-id: 3d76d6655b
[formerly 724bb85676
[formerly aec317f506eb940e843a0c3cf4ffa55a83eb186b]]
Former-commit-id: 724bb85676
Former-commit-id: d219a687c9
2014-02-07 13:00:00 -06:00
Ben Steffensmeier
fc0d044bd9
Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers.
...
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834
Former-commit-id: 97a64f89f1
[formerly 8865177c6b
[formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]]
Former-commit-id: 8865177c6b
Former-commit-id: 921401ffe9
2014-02-03 14:07:07 -06:00
Everett Kladstrup
aac0fd726e
Issue #2725 deriv param to common stage 1
...
* Removing viz dependencys from derivparam
** Move LevelUtilities to common
** Use spring instead of eclipse plugin extentions
to configure derived parameter function types
** Use RequestRouter instead of ThriftClient so
we can use IServerRequest objects in both CAVE
and EDEX
The next stage will be to clean up exceptions in
derived parameters to stop using VizException and
VizCommunicationException.
Former-commit-id: 80ad25754b
[formerly bd50a38d87
[formerly 604ae156f8b235e2e1736863b419547289403240]]
Former-commit-id: bd50a38d87
Former-commit-id: 90df04614d
2014-02-03 09:02:58 -06:00
Steve Harris
f562540e7c
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java
Former-commit-id: 1aea63a1f6
[formerly 1738185503
[formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]
Former-commit-id: 1738185503
Former-commit-id: 14ba3b29f4
2014-01-29 09:41:57 -06:00
Ben Steffensmeier
33bf8e9c44
Issue #2363 Add General implementation od IColormapShadedShapeExtension so that all targets will be able to render filled wind barbs.
...
Former-commit-id: a92f6e9bb6
[formerly 6aa6683258
[formerly e214a045c4d45532ed80fb4cdd51355c7884a2ee]]
Former-commit-id: 6aa6683258
Former-commit-id: 9c65c5b07b
2014-01-23 12:41:16 -06:00
Ben Steffensmeier
f1de2aaded
Issue #2602 Don't try to load classes from uninstalled bundles.
...
Former-commit-id: 3187754736
[formerly 0c4fc0dd01
[formerly 30ca0135046851884e4a07b36559fce086ccd3f2]]
Former-commit-id: 0c4fc0dd01
Former-commit-id: c7357863b9
2014-01-22 15:46:51 -06:00
Steve Harris
56f5ae9f48
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: 69dc3d835b
[formerly 24ab7cff49
[formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]
Former-commit-id: 24ab7cff49
Former-commit-id: a465718a0d
2014-01-21 12:36:54 -06:00
Nate Jensen
aff68ba134
Merge "Issue #2651 Synchronize ResourceList.removeRsc." into development
...
Former-commit-id: 0bf6222d1e
[formerly e2dfdb01b7
[formerly af27de2a1e1d613da2b75519f4679762e32ff7d3]]
Former-commit-id: e2dfdb01b7
Former-commit-id: d6862c2b02
2014-01-20 09:23:24 -06:00
Ben Steffensmeier
63ad599a0e
Issue #2651 Synchronize ResourceList.removeRsc.
...
Former-commit-id: d8263b358d
[formerly a580fc74b7
[formerly f0ecb93ab2934edaab06409b04b21d40ed6e5ff8]]
Former-commit-id: a580fc74b7
Former-commit-id: 15c08d7209
2014-01-17 11:58:00 -06:00
Ben Steffensmeier
7656304906
Issue #2313 Image canvas rendering.
...
Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417
Former-commit-id: 16c350f0c6
[formerly 625aac3ed3
[formerly 0f8d0c52093a14d16a36ce353c2587633474007d]]
Former-commit-id: 625aac3ed3
Former-commit-id: 76414243ba
2014-01-16 17:05:16 -06:00
Nate Jensen
aa0639a878
Issue #2359 printout connection exceptions to aid in diagnosing
...
connectivity problems
Change-Id: I957abb82cd3a736485f289a266b00cdbd89a578c
Former-commit-id: 5f39322d59
[formerly fc6b31c1c0
[formerly 8d7445a4ba4b76335166569de32c00bac1a2a84b]]
Former-commit-id: fc6b31c1c0
Former-commit-id: ccaa9dbde1
2014-01-15 13:39:28 -06:00
Max Schenkelberg
30059d255c
Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
...
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index
Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5
Former-commit-id: cc2080449c
[formerly 16046a4dde
[formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]
Former-commit-id: 16046a4dde
Former-commit-id: b3aed99142
2014-01-06 17:03:45 -06:00
Steve Harris
36b228cc7f
Merge branch 'omaha_14.2.1' into development
...
Former-commit-id: 64f8564cd8
[formerly 0950a8a1ba
[formerly 71a8fd9b0659b06e366e734c06fa74232787238b]]
Former-commit-id: 0950a8a1ba
Former-commit-id: 8aac57e096
2013-12-18 13:14:27 -06:00
Ben Steffensmeier
c92b5842ab
Issue #2602 Switch around the order of some things on startup to make thinclient better.
...
Former-commit-id: 922674273e
[formerly a37db9d1b4
[formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]
Former-commit-id: a37db9d1b4
Former-commit-id: bf508b4455
2013-12-11 12:45:11 -06:00
Max Schenkelberg
0084b5b4f1
Issue #2620 Fixed viz base feature dependency issues.
...
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec
Former-commit-id: 987d4b3a30
[formerly 9d846aa104
[formerly 520e22dd848cf6472232d60789e1f6938db7c776]]
Former-commit-id: 9d846aa104
Former-commit-id: be45102814
2013-12-09 15:14:01 -06:00
Nate Jensen
899bc199bb
Issue #2599 fix constructor
...
Change-Id: I90564c027b23f449181fe46a9d8f2cebddf4d52e
Former-commit-id: 41014a105d
[formerly 9bff38e0d3
[formerly 8b0c799cf132a90211d1344d4e16785895f76263]]
Former-commit-id: 9bff38e0d3
Former-commit-id: ec6b5393ef
2013-12-06 12:35:22 -06:00
Richard Peter
7969ef9648
Merge branch 'development_on_RHEL5' (GOES-R) into development
...
Conflicts:
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
nativeLib/edexBridge/edexBridge.cpp
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: e82e1137f9
[formerly f5f75ec629
[formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]
Former-commit-id: f5f75ec629
Former-commit-id: 760f215e8c
2013-12-03 16:25:31 -06:00
Ben Steffensmeier
dcfdc9a24b
Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
...
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0
Former-commit-id: 3696896b49
[formerly 927801985a
[formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]
Former-commit-id: 927801985a
Former-commit-id: 8a7d3ceab1
2013-11-25 11:31:57 -06:00
Ben Steffensmeier
0a3d78555e
Issue #2544 Fix recycling issues with Satellite resources.
...
Former-commit-id: 9ff1751f4e
[formerly e392185d78
[formerly 166957a22c3447fa2407b13362eece24943675c9]]
Former-commit-id: e392185d78
Former-commit-id: 15ae95075d
2013-11-18 11:44:56 -06:00
Nate Jensen
9517c96d68
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: c5cf68cc45
[formerly 9acda0b9f2
[formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]
Former-commit-id: 9acda0b9f2
Former-commit-id: a4eb19fc79
2013-11-14 13:29:30 -06:00
Nate Jensen
1174d22160
Issue #2361 remove using SerializationUtil for processing XML colormaps
...
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7
Former-commit-id: 7a73c65430
[formerly b52bdb1cec
[formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]
Former-commit-id: b52bdb1cec
Former-commit-id: 2c0c20f01e
2013-11-12 10:37:54 -06:00
Max Schenkelberg
752c9574b4
Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing.
...
Change-Id: Ic82f45447113425a08909be4c5229502882db022
Former-commit-id: bd903f6641
[formerly e58a5df04b
[formerly 58ccc575973ea9a1778659e17daff8577747dec5]]
Former-commit-id: e58a5df04b
Former-commit-id: 2f794486e3
2013-11-11 11:09:00 -06:00
Nate Jensen
f5b461908d
Issue #2361 fix saving hydro table objects
...
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de
Former-commit-id: 08441efbb7
[formerly 7a27264094
[formerly 0f406375b030a87d3fa12e46255897bfa469119d]]
Former-commit-id: 7a27264094
Former-commit-id: 040f022e5d
2013-11-08 12:37:26 -06:00
Max Schenkelberg
3af5098e1b
Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common
...
Amend: Fixed precision issue with float comparison, made factory better synchronized.
Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2
Former-commit-id: c28fd2b38d
[formerly 3369fbec2d
[formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]
Former-commit-id: 3369fbec2d
Former-commit-id: d7c8b8f662
2013-11-06 15:07:18 -06:00
Nate Jensen
7648e116ad
Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
...
Former-commit-id: de50a9214b
[formerly ccf3d5b1e9
[formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]
Former-commit-id: ccf3d5b1e9
Former-commit-id: b17891ba0e
2013-10-31 12:24:23 -05:00
Ben Steffensmeier
a4cbc8020a
Issue #2491 Bug fixes and clean up all remaining resource datas.
...
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6
Former-commit-id: 27a392f90e
[formerly 5b395f7417
[formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]
Former-commit-id: 5b395f7417
Former-commit-id: e15fecc459
2013-10-29 17:35:55 -05:00
Nate Jensen
a18df07586
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: 6880a18f1a
[formerly f3143ba7b4
[formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]
Former-commit-id: f3143ba7b4
Former-commit-id: 554a9cddf3
2013-10-29 14:33:53 -05:00