Ron Anderson
d126af0f85
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/FormatterlauncherAction.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowProductScriptsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowPublishDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSendIscGridsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/ingest/LocationTablesIngest.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ie790e3a9a0c3829655a5a798a2c8b6740d02be6c
Former-commit-id: 691ca66a6f15c3cfae1bd1c8990644951d68a46f
2015-10-14 16:31:41 -05:00
Ron Anderson
2c33406500
Omaha #4967 Fix a missed __numpy__ instance
...
Change-Id: I1cffb3479c963e62d7e5e3fedac69341f1d0e718
Former-commit-id: 12e92bcf4d828cbd449f8255a29cc2da79c0c836
2015-10-12 17:57:59 -05:00
David Gillingham
75ef14640b
Omaha #4958 : Add support for viewing raw NationalBlend model data to GFE.
...
Change-Id: I1e8f43459cf0582fdd40aecb64ea98c9986611fb
Former-commit-id: 1856ec86534f5ab6a3be8a0ac8bdd11da5efff20
2015-10-09 11:09:08 -05:00
David Gillingham
aade834155
Omaha #4698 : Add support for viewing raw NCOM NOS data to GFE.
...
Change-Id: Id545343f39f617b3d4832213d7cf47c0a9fa5695
Former-commit-id: 3aff9cc9b29d6740b904efc91be2041438c96738
2015-09-29 10:36:33 -05:00
David Gillingham
8579d9f714
Omaha #4699 : Add support for viewing raw POES/GOES Blended SST data to GFE.
...
Change-Id: Ie4a84057d356699a6ebd3cb0ae1a6105ab27aa94
Former-commit-id: ec349ae45582326cc62999d9d82a875efd1e854f
2015-09-28 16:23:04 -05:00
Roger Ferrel
69f5eac314
Omaha #4819 Changes for browsers and GFE to add HWRF.
...
Change-Id: Icdb2ad322a57d19e8fe4f5745785fe114c50c8fd
Former-commit-id: 2af405298fd751a3f9282a24fb4310216bb84acd
2015-09-21 07:00:31 -05:00
Nate Jensen
5868156a2a
Merge "Omaha #4719 : Optimize use of numpy.where in GFE viz code." into omaha_16.2.1
...
Former-commit-id: 62108e3fb994f22c420853005d192dc27e0874cb
2015-08-18 12:50:57 -05:00
David Gillingham
8724737db3
Omaha #4719 : Optimize use of numpy.where in GFE viz code.
...
Change-Id: I032e4e45e48dfc8dc191b83bcfc38583d5057aaa
Former-commit-id: 85ef6c2a7daaa2a186a58a0b5d8080a490792d35
2015-08-18 12:35:13 -05:00
David Gillingham
added7d1a3
Omaha #4750 : Remove python call from DataManager.doIscRequestQuery.
...
Change-Id: I31cadce5753f89b31f55b46e2c92c91684da68d5
Former-commit-id: 23fd85e29be6c4da9d6d1a843f5627477bf7a147
2015-08-18 10:54:26 -05:00
Ana Rivera
9a33597d6e
Merge branch 'omaha_16.1.1' into field_16.1.1
...
Change-Id: I9da773e70da7bb8d62253093f20aebd8aea328f6
Former-commit-id: 0c909272ebdaf4ce94195b54a021a38c1e174ff3
2015-07-20 15:56:51 +00:00
Ana Rivera
e075f22bf7
Merge branch 'omaha_16.1.1' into field_16.1.1
...
Entry for NTAT missing from omaha_16.1.1's LevelMappingFile.xml.
Change-Id: I39893e6aa748f7dfeb30bd23bcfca3853fa51e17
Former-commit-id: cc1e4ea67074c41be411c99ce979124a63c7c743
2015-07-07 19:41:48 +00:00
Ron Anderson
2853d08519
Omaha #4259 Fix lat/lon grids and ifpnetCDF parmList issues
...
Change-Id: Ie1437c6455a7c88a31ba0152bd56976ab6ce70c3
Former-commit-id: 26faf2500b76504bddcda0e6eb5dbe334e6cdc3f
2015-07-07 10:35:17 -05:00
Roger Ferrel
7ea0965a35
Omaha #4537 - Changes to HRRR parameterInfo for 15 minute interals and GFE entries.
...
Change-Id: Id1fceb6181d3eee0149ef19ed0d5c88be631fc10
Former-commit-id: 383074e1fd79706f3c7662360f3d43178300d383
2015-06-30 12:35:42 -05:00
Ron Anderson
da5074f8d1
Omaha #4586 Fix PlotSPCWatches to work in both practice and operational mode.
...
Change-Id: Ic95813e3de57baec59a311ddf9a4352b58c0ed2c
Former-commit-id: d51b770352fefd77cdc62cf58a9578a7bf4194de
2015-06-25 16:50:15 -05:00
Ron Anderson
cff9bff86e
Omaha #4586 Fix PlotSPCWatches to work in both practice and operational mode.
...
Change-Id: I7412a316b55210508e3406568bb6bae78446246a
Former-commit-id: b3a2ab5fae872ced8d037827bdda1a1344c7a41e
2015-06-25 10:42:13 -05:00
Joshua Watson
f6d61cc1e6
VLab Issue #8489 - Add ESTOFS Pacific basin data; fixes #8489
...
Change-Id: I033bcc8116f7d4bef4aa017fd62ea8f049372ca4
Former-commit-id: 694cbaad0bad4aae7c2e67c44ca3106a73b97d77
2015-06-22 14:37:43 -04:00
Steve Harris
4f4f417efb
Merge tag 'OB_15.1.1-18' into omaha_16.1.1
...
15.1.1-18
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
Former-commit-id: 383347accebb250ce3c761ad2e1cc0aaa58abde3
2015-06-16 09:35:56 -05:00
Fay.Liang
0fa6593639
Merge tag 'OB_14.4.1-50' into int_15.1.1
...
14.4.1-50
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
Former-commit-id: a2a24493e5015323a22fbce1b2cb7b28f81b9f9c
2015-06-11 17:12:14 -04:00
Steve Harris
4de63454fc
Merge tag 'OB_15.1.1-16' into omaha_16.1.1
...
15.1.1-16
Conflicts:
cave/com.raytheon.viz.gfe/build.properties
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
2015-06-05 15:38:00 -05:00
Bruce.Hundermark
8f9f0f09ba
ASM #17515 - GFE - RTMA and URMA parameter corrections
...
Change-Id: I1d7f009e8ec48beee75f9369fa54f41feecaadc8
Former-commit-id: 0ddcb5c8e6d8b254d899e8bda2579fe12fa7692e
2015-06-03 21:19:25 +00:00
Ana Rivera
9b3f6e4119
VLab Issue #8525 - DR17559 Add ISC_NHA Edit Area; fixes #8525
...
Change-Id: Iab62946461313afdf3a6246cec937f1715826f6a
Former-commit-id: 53fd0b6516a128ce130844ff98c20e79f40cd29d
2015-06-03 19:42:55 +00:00
Steve Harris
9b3d8a8443
Merge tag 'OB_15.1.1-12' into omaha_16.1.1
...
15.1.1-12
Conflicts:
build/deploy.edex.awips2/esb/bin/setup.env
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
2015-05-20 11:25:45 -05:00
Bruce.Hundermark
15db360d00
ASM #17144 - GFE: Add Capabilities for CONUS real-Time Mesoscale Analysis at 2.5km
...
Change-Id: Id759bf52cfcf7ee7a13e65facf3dfd32be9feb22
Former-commit-id: a1f4da43d6b9271789ca42f71c3d7334f8a6b773
2015-05-13 14:47:16 +00:00
Nate Jensen
397fa4a07e
Omaha #4259 gfe changes for jep upgrade to 3.3
...
Change-Id: I5887537b7bcd05ea289fdd04851618264829987d
Former-commit-id: 83ba21f361e4c528115533ca72be8efd0109eb9d
2015-05-07 09:02:20 -05:00
Steve Harris
7375074ed8
Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
...
15.1.1-2m
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
2015-03-30 11:07:52 -05:00
Ron Anderson
8c54ff2f61
Omaha #4300 Client-side changes for multi-site service backup
...
Change-Id: Ibcf05dfc67fa3824a5fe716e1d4038ad5aeb4034
Former-commit-id: 8daff8d5bb3e1bbf23a559671040cae4a03c9911
2015-03-23 16:08:31 -05:00
Fay.Liang
b23791cfbd
Merge branch 'ops_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 5879ba157369936274e88800e4f178e67567de95
2015-03-19 12:45:22 -04:00
Ron Anderson
7bbd4b6a25
Omaha #3955 Additional updates to try to make the procedures more bulletproof.
...
Change-Id: Ie4c9d02c880dd460ef3470db9c68f5a67c0e924c
Former-commit-id: 1ff0a8ab8715a780fdc14db7f81f1708567fdc78
2015-03-12 16:23:37 -05:00
Baoyu Yin
7ed46744e4
VLab Issue #6619 - AWIPS2_DCS_14537 GFE Add parameters to RUC13 parameterinfo file; fixes #6619
...
Change-Id: I13b350ee4f5685a723f78473d07003683b058e68
Former-commit-id: b28cfa863daf9e156855791c4d015dfe5a379c27
2015-02-25 14:13:53 -05:00
Roger Ferrel
112c0322b2
Omaha #4053 Added Great Lakes Wave Model 2.5KM to product browser, volume browser and GFE.
...
Change-Id: Iabb0b401a51e7fbb069ed8c6e7b44e2d9382c421
Former-commit-id: 66098b89fcf6cd5bcf950024c5a40722018b02d5
2015-02-12 13:43:37 -06:00
Steve Harris
118f52263f
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Former-commit-id: ffee274d844442a36d633deda5776c09a758cb38
2015-02-12 12:48:29 -06:00
Fay.Liang
43c7161dcf
Merge branch 'master_14.3.2' into master_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: e91a78eec910b84f44350d3aae68a26f4e0dcd72
2015-02-09 17:19:41 -05:00
Steve Harris
afb3d31759
Merge tag 'OB_14.4.1-6m' into omaha_15.1.1
...
14.4.1-6
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 9fd5ed1aea1a667552144da88dcc394a99133c52
2015-02-03 12:25:05 -06:00
Steve Harris
47234a3757
Merge tag 'OB_14.4.1-5m' into omaha_15.1.1
...
14.4.1-5
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 28075dabb4b6421ddaee3af71518f565d9bc7e90
2015-01-28 13:45:36 -06:00
Ana Rivera
20ad0a65f3
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 291d66c66af4f1f4d298185412d5930714ffb2c5
2015-01-27 22:05:59 +00:00
Ana Rivera
327945af8b
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18
Former-commit-id: 889608360567b829f81ed6392c64c669798f34a9
2015-01-27 16:28:42 +00:00
Ana Rivera
7c25945fd9
Merge branch 'master_14.4.1' into emc_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
2015-01-26 18:45:26 +00:00
Steve Harris
9234ceb485
Merge tag 'OB_14.4.1-2m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)
Former-commit-id: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
2015-01-23 09:32:44 -06:00
David Gillingham
4604975854
Omaha #4014 : Add ingest and display support for ETSS model.
...
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846
Former-commit-id: fa7e11a22b47a48d2bc7b9cf6f0ddfd97ea2fea7
2015-01-20 14:02:06 -06:00
Joshua Watson
5aa4748569
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
...
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29
2014-12-17 08:38:27 -05:00
Ana Rivera
1823ed3596
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129 , #5421 , #5345 .
...
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 111ae763e6becb944e34e262e1d87d2d344236e4
2014-12-16 23:39:02 +00:00
Ron Anderson
2c99ce902a
VLab Issue #4953 Added support for nwrwavestcv and sending TCV files to VTEC partners
...
Change-Id: I2af1f2eaf0625ea58153ebebc1ad10bb76da52bd
Former-commit-id: 18ab45bdae51ae9971a0c5f4b4bde7afe82074d4
2014-12-12 17:25:52 -06:00
Richard Peter
8de1ebcb65
Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java
Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5
Former-commit-id: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
2014-12-12 10:36:04 -06:00
Joshua Watson
bca4b40eed
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
...
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: cfce2a5f633a7312b9ad64dafb559c834b0ceddf
2014-12-11 11:39:00 -05:00
Roger Ferrel
597fdb8280
Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
...
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a
Former-commit-id: 46d3bbcc99d93845dcb159012b872fe746756b7c
2014-12-04 12:52:22 -06:00
Ron Anderson
ebeb4440ef
Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time.
...
Change-Id: I8e6f79bf6b7754924480a39f1631ba10a12bdcae
Former-commit-id: e656ec3ccf20ae4a9eae23040e1a08d7032ee42a
2014-12-02 11:45:05 -06:00
Ana Rivera
fe5bfbaa73
VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
...
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f
Former-commit-id: 6866439b0a7075f04146af4b4bdce59477269f4d
2014-12-02 15:44:07 +00:00
Ana Rivera
5abf37ea62
VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
...
This reverts commit f1f5f2c717
2014-12-02 13:43:03 +00:00
Ana Rivera
1999049d90
Merge branch 'master_14.4.1' into emc_14.4.1
...
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb
Former-commit-id: c69e94f227cb908a9af2e1cd2db35b25bef28701
2014-11-21 14:23:49 +00:00
Ron Anderson
9104023408
VLab Issue #4953 Added support for managing JSON files in practice mode.
...
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8
Former-commit-id: e8ac81c5850b8565ea1e375857cf9dfe531848a0
2014-11-19 11:31:49 -06:00
