Commit graph

2189 commits

Author SHA1 Message Date
Steve Harris
2c7ff9b631 Merge branch 'master_13.2.1' (13.2.1-8) into omaha_13.2.1
Former-commit-id: 15d6e6ad3b [formerly ae66ccc3ee] [formerly acaef77d90 [formerly 5e40606e95d506d213de3916f0f5d3a4eee7884a]]
Former-commit-id: acaef77d90
Former-commit-id: 8da2277243
2013-02-18 09:14:13 -06:00
Steve Harris
8cffb55371 13.2.1-8 baseline
Former-commit-id: 18da2e93d7 [formerly f81b382c04] [formerly 053156f02e [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: 053156f02e
Former-commit-id: c6d584758f
2013-02-18 09:09:41 -06:00
Nate Jensen
d39e16e532 Merge "Issue #1614 Cache LatLonReprojection results. Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338" into development
Former-commit-id: eb8e87dfe2 [formerly 88b665c09a] [formerly 52a0673961 [formerly cb57fe31471693b2f3398d0c6bd97af36410d9b8]]
Former-commit-id: 52a0673961
Former-commit-id: d648e77fa5
2013-02-18 09:07:18 -06:00
Ron Anderson
292614bc25 Merge "Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing UIControllers to be constructed at startup, not on demand." into development
Former-commit-id: cf0fc8d921 [formerly e70cfc5825] [formerly a6d87cdd7e [formerly a1e38ed2f2da79028b04589a548b16543700f08f]]
Former-commit-id: a6d87cdd7e
Former-commit-id: 999ac02aea
2013-02-18 08:31:50 -06:00
Steve Harris
58bafc0068 13.2.1-8 baseline
Former-commit-id: da707ff25c [formerly 27d88edcb9] [formerly 535a9402a7 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]
Former-commit-id: 535a9402a7
Former-commit-id: a68ce64f45
2013-02-18 09:23:06 -05:00
Mike Duff
3e59308771 Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 897262630c [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 079ec4b6dd
2013-02-18 08:16:57 -06:00
Richard Peter
1b112227a8 Merge "Issue #1506 move away from using QueryScript on the UI thread, except where absolutely necessary we can run a synchronous operation" into development
Former-commit-id: 5bf0e0e999 [formerly 51533ccab2] [formerly 70f270ff16 [formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]
Former-commit-id: 70f270ff16
Former-commit-id: 2299503559
2013-02-15 16:40:04 -06:00
Richard Peter
774ea0ede6 Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
Former-commit-id: b3e2ca7b30 [formerly a40ae4d8b2] [formerly a6fa92923f [formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]
Former-commit-id: a6fa92923f
Former-commit-id: 5936f671ce
2013-02-15 16:33:00 -06:00
Ben Steffensmeier
5b1acfdeb3 Issue #1614 Cache LatLonReprojection results.
Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338

Former-commit-id: a10e7edaeb [formerly e53416937e] [formerly feb2e98e58 [formerly 2596b3105e377f0fb8713be502a41b4b2f470e93]]
Former-commit-id: feb2e98e58
Former-commit-id: 6b53511f9e
2013-02-15 14:24:22 -06:00
Brad Gonzales
1501ed6deb Issue #1615 Changed radar header names to match other header names.
Change-Id: I6b3be3028a1602ead03ec209e773db68bbfb665a

Former-commit-id: 1ddcd8b3a8 [formerly a9012633a1] [formerly 961f51e91f [formerly b7f5d565bdfb8f1289f73837ffa9a54f2659d65c]]
Former-commit-id: 961f51e91f
Former-commit-id: 0dda5f784e
2013-02-15 14:02:03 -06:00
Ron Anderson
ca6ca60f22 Issue #1629 fix error storing preferences in GIS Viewer
Change-Id: Id677dd9206c16f8c95b022e31fcac7acc6b07eb6

Former-commit-id: d4a915b48d [formerly 689c32a9c3] [formerly 354d8b0366 [formerly 7d73fd3f0f2d8ebbbf75d5928b06202f5f7cd42a]]
Former-commit-id: 354d8b0366
Former-commit-id: 4334fab2f9
2013-02-15 13:44:52 -06:00
David Gillingham
cc05bdae4e Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing
UIControllers to be constructed at startup, not on demand.

Change-Id: Ifb492171ac4720e36f68da082c38d31c1de08132

Former-commit-id: 9fae6695e2 [formerly 871364d630] [formerly da091b723d [formerly 463af46e64ed667efbc840d85f9babf3449780cc]]
Former-commit-id: da091b723d
Former-commit-id: 244bc9b270
2013-02-15 12:50:48 -06:00
Jonathan Sanchez
763280dd53 Issue #1624 Temporary fix for NullPointerException.
Former-commit-id: 18dd00e488 [formerly f507d23fed] [formerly fea6b44036 [formerly f95a402347ae45ad133206bfea796b240decf0a6]]
Former-commit-id: fea6b44036
Former-commit-id: 1486022395
2013-02-15 12:31:21 -06:00
Lee Venable
5ec5918e45 Merge "Issue #1607 Added time variables for CORs." into development
Former-commit-id: 628d0d9840 [formerly d94233499a] [formerly 91e016aa34 [formerly 7a6200d4bfe21feb6e29603dd638876f50a66162]]
Former-commit-id: 91e016aa34
Former-commit-id: 38bbca4895
2013-02-15 12:08:15 -06:00
Nate Jensen
d6ba283efc Merge "Issue #1614 Refactor data access framework to use single request. Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798" into development
Former-commit-id: 1b1e468e1f [formerly f748815e22] [formerly f79f7db348 [formerly 55acd96d99a61170cbbc2b202e9562912b6fb0c3]]
Former-commit-id: f79f7db348
Former-commit-id: a60cf277bc
2013-02-15 11:56:11 -06:00
Ben Steffensmeier
91bbdc3337 Issue #1614 Refactor data access framework to use single request.
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798

Former-commit-id: e771076275 [formerly 1393f3e3cf] [formerly 0933a5f596 [formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]
Former-commit-id: 0933a5f596
Former-commit-id: f0f3c71d50
2013-02-15 11:39:56 -06:00
Ron Anderson
632bd48a45 Issue #1629 Attempt to fix error saving preferences in GIS Viewer
Change-Id: I982637de1cc898d9887849a8276a3693b9579d5b

Former-commit-id: 3033238f1b [formerly d574da6155] [formerly b76653a885 [formerly f0d1aa59c4971ed523e4f26b440134a417aec5d0]]
Former-commit-id: b76653a885
Former-commit-id: df84bf7f86
2013-02-15 11:13:43 -06:00
Jonathan Sanchez
352d3dea5a Issue #1607 Added time variables for CORs.
Former-commit-id: 38802d3df8 [formerly 6d968dc09d] [formerly 3025639923 [formerly 311f633ba47efcf3b13f77867e1fa32a584f3232]]
Former-commit-id: 3025639923
Former-commit-id: bb797eeb74
2013-02-15 09:59:12 -06:00
Ron Anderson
d69d628450 Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: dc7c9edb87 [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly dc9ac54903107224633b4e18d5caa345649d8266]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: e952a4f179
2013-02-15 09:03:41 -06:00
Richard Peter
ad4110a73f Merge "Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging." into development
Former-commit-id: dcd4761b54 [formerly eb00310ef9] [formerly b54ec2b59e [formerly b3c7458333b9a8d0f011614c0b4845397e074ce8]]
Former-commit-id: b54ec2b59e
Former-commit-id: 0bab06709b
2013-02-15 08:44:02 -06:00
Richard Peter
015b51082d Merge "Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType." into development
Former-commit-id: bd91d2b8be [formerly 5a5a5ba855] [formerly d905313941 [formerly 7071c075ee2282b6048cafdefac6d6c83a344ca0]]
Former-commit-id: d905313941
Former-commit-id: 2d8327e76f
2013-02-15 08:31:33 -06:00
Dustin Johnson
d0ecd69456 Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41

Former-commit-id: 4be6c12ac6 [formerly 714ea1c8d8] [formerly 6e2f69939f [formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]]
Former-commit-id: 6e2f69939f
Former-commit-id: 1ef440f8ee
2013-02-15 08:13:11 -06:00
Dustin Johnson
0156736b85 Merge "Issue #1595 Fix expired subscription update retrieval time scheduling" into development
Former-commit-id: 6ba5f0d03b [formerly d71773dbb4] [formerly f96d83110c [formerly 5ec93e8102bcd837650b4ae7725dceaa8bb61bfd]]
Former-commit-id: f96d83110c
Former-commit-id: 507c83f32a
2013-02-15 08:08:49 -06:00
Brad Gonzales
936facbe86 Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType.
Amend: Corrected comment in convertPluginNameToDataType.sh

Change-Id: I5e0084704cef599d368165058b8008bbb2bc8e18

Former-commit-id: 6a0e9c331b [formerly 03dd42463e] [formerly dfef89ee64 [formerly a2391d76c91d3d2b86b8e74eed1e0754091650a0]]
Former-commit-id: dfef89ee64
Former-commit-id: e495a5f663
2013-02-14 17:34:55 -06:00
Nate Jensen
ebb3394719 Merge "Issue #1627 Sped up FFMp load by removing un-needed DB calls." into development
Former-commit-id: be680f2523 [formerly 7cf29fbf39] [formerly 6d8b8dd774 [formerly c83110e509d662da0a4b1975bc1044fb7ffadb9e]]
Former-commit-id: 6d8b8dd774
Former-commit-id: 0ce3009528
2013-02-14 16:39:23 -06:00
Ben Steffensmeier
086f6aabe9 Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
Change-Id: I48738965df0da9052f810dfc1f312ed032693390

Former-commit-id: 1940a92596 [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: 455aa4628f
2013-02-14 15:34:25 -06:00
Dustin Johnson
158ce1fe5b Issue #1595 Fix expired subscription update retrieval time scheduling
Change-Id: I225bf887d03e43295f4b18eea677bb24c032b8a7

Former-commit-id: 54dd90afdd [formerly 656601f272] [formerly f6a286da2d [formerly 26dd90355f6ce2ed5c409a142622cf220754c2ab]]
Former-commit-id: f6a286da2d
Former-commit-id: 776581bc55
2013-02-14 15:33:06 -06:00
Dave Hladky
7f6381ec5c Issue #1627 Sped up FFMp load by removing un-needed DB calls.
Change-Id: Ice81630bd72b7f64d6f0817d2e531877b0072956

Former-commit-id: 83fe9ca104 [formerly 8247da158f] [formerly a8f6635a6f [formerly db09538ad0664b8a7f3eb83f062a47490975f7b1]]
Former-commit-id: a8f6635a6f
Former-commit-id: 4cd9b2e8b2
2013-02-14 15:12:29 -06:00
Nate Jensen
b4aea0385c Merge "Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT" into development
Former-commit-id: 5526ee7e8d [formerly 1144f08e59] [formerly a3e0bf09ab [formerly a8fbe37f3f30721d7a14c653993758c1a9f2d2ad]]
Former-commit-id: a3e0bf09ab
Former-commit-id: 3f5b8b56ef
2013-02-14 15:05:14 -06:00
Dave Hladky
a17dee033a Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950

Former-commit-id: 2655952304 [formerly 7b3a310f67] [formerly 381aec5976 [formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]
Former-commit-id: 381aec5976
Former-commit-id: 5c66cbcd27
2013-02-14 13:58:32 -06:00
Steve Harris
c75b30c245 13.2.1-7 baseline
Merge branch 'master_13.2.1' into master_13.3.1

Conflicts solved with 'theirs' strategy (all of 13.2.1-7)

Conflicts:
	cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
	cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: a67564bea7 [formerly a53a44d42c] [formerly d9028f55d3 [formerly 1108d28cc473cd1b6be7ec5c78e78c7b6d1ea56f]]
Former-commit-id: d9028f55d3
Former-commit-id: 5bf55de767
2013-02-14 13:55:35 -06:00
Steve Harris
a491a84615 13.1.1-10 baseline
Former-commit-id: baa5de2147 [formerly 06d0e6dd16] [formerly 9b73b6a2a9 [formerly 1e337899d45617a8ee1998f2d2c86f2912668b67]]
Former-commit-id: 9b73b6a2a9
Former-commit-id: c8c783f128
2013-02-14 13:24:43 -06:00
Steve Harris
57ccd18d85 13.1.1-10 baseline
Former-commit-id: eff75cc712 [formerly 56a36af0c2] [formerly 986c332e69 [formerly d5639bcdf900c60d883eb975e3062ebc55803da1]]
Former-commit-id: 986c332e69
Former-commit-id: fa962f98a4
2013-02-14 14:11:00 -05:00
Lee Venable
dfef1c916a Merge "Issue #1605 Improved finding closest area locations. " into development
Former-commit-id: 4383968e23 [formerly b047a0393f] [formerly 60f3f46d19 [formerly 1c778e9c7140214bed727a2eac73c0461d134341]]
Former-commit-id: 60f3f46d19
Former-commit-id: 4952a3f595
2013-02-14 12:56:01 -06:00
Matt Nash
126537966c Issue #1506 move away from using QueryScript on the UI thread, except where
absolutely necessary we can run a synchronous operation

Change-Id: I4503d4e18e3f458b7df7c2d187e8880d5a3d2cc7

Former-commit-id: 75f51be7b2 [formerly bc954889eb] [formerly 5b136272a3 [formerly f6ef0f0ebc9002caad9a632515402b84280892fc]]
Former-commit-id: 5b136272a3
Former-commit-id: d29162c654
2013-02-14 11:47:34 -06:00
Ron Anderson
377e85913f Merge "Issue #1515: Better handle notifications received after disposing VCParms." into development
Former-commit-id: 11212b51db [formerly e04322f7ad] [formerly 96fee6ea56 [formerly 1f5fbc207e533be5a7dde9651dd35743a0fc3a34]]
Former-commit-id: 96fee6ea56
Former-commit-id: b5ff9b6998
2013-02-14 11:13:26 -06:00
Jonathan Sanchez
c1a832ef3a Issue #1605 Improved finding closest area locations.
Former-commit-id: 4555420e82 [formerly 9641b67da4] [formerly 1722713689 [formerly b8a43d95121a1876dc8136bd5758e9452167fad2]]
Former-commit-id: 1722713689
Former-commit-id: 459472a793
2013-02-14 11:12:23 -06:00
Ben Steffensmeier
efaddb710c Issue #1614 allow locationNames for grid data access
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2

Former-commit-id: ef7addb005 [formerly ab319bd3a8] [formerly 9b4de367e3 [formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]
Former-commit-id: 9b4de367e3
Former-commit-id: 0995024482
2013-02-14 10:07:01 -06:00
Dustin Johnson
6f821ed8c9 Issue #1543 Serialize DODS response rather than plugin data objects directly
- Remove proxy classes for Spring transactions, use interfaces as Spring recommends.

Amend:
   Peer review comments.
   Set retrieval status to failed when payload is null.

Change-Id: I458b13856302c8faceeef985c1c41115644520b7

Former-commit-id: 25faaa2af0 [formerly dd8ca33fc4] [formerly d143735ea8 [formerly 69f294183da4bbeb535b11c81550b1e9b4124ac6]]
Former-commit-id: d143735ea8
Former-commit-id: 9783dc4d9f
2013-02-14 09:49:22 -06:00
Nate Jensen
3ff7ce2248 Merge "Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away." into development
Former-commit-id: e3b89f87c6 [formerly 5b8504196e] [formerly 25580a8adc [formerly 4c1268c3d9c8acaad2fe334c97ee2fb8f6d5ccff]]
Former-commit-id: 25580a8adc
Former-commit-id: dcb90069cf
2013-02-14 09:26:14 -06:00
Roger Ferrel
951e5b237d Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away.
Change-Id: I7716af97c3a94f2243be1b219ed9f91c7b67c0d8

Former-commit-id: bfb9f9f156 [formerly 2b509cf7de] [formerly e26689a487 [formerly 9ac5a199108a1e1d106a79e67cd6209bd46134cb]]
Former-commit-id: e26689a487
Former-commit-id: e7bae3c272
2013-02-13 16:45:52 -06:00
Ben Steffensmeier
823f75f6c7 Issue #1621 Fix model run precip.
Change-Id: Ia488b75544778714fa180dd981f150241351c4d2

Former-commit-id: 0e860d434c [formerly c171998d91] [formerly 41a7766cd9 [formerly 8969af754acb0c987d0dc565edda9d0793188118]]
Former-commit-id: 41a7766cd9
Former-commit-id: 8585229352
2013-02-13 15:41:39 -06:00
Max Schenkelberg
66512cecc6 Issue #1610 Fixed null pointer on FileTreeView when file updates arrive and view has not expanded file structure
Change-Id: Ibfa11dc41ee5fa2a7421469a58932b415261c343

Former-commit-id: 2f8b88df4d [formerly ecb0906597] [formerly 02207b777c [formerly 71b40ef692f0c2109e1026ac5d953d34e808938f]]
Former-commit-id: 02207b777c
Former-commit-id: bbc904894a
2013-02-13 15:18:54 -06:00
David Gillingham
a6883700ee Issue #1515: Better handle notifications received after disposing VCParms.
Change-Id: Ia73102329755303b504871ed55f2a294ef390126

Former-commit-id: 02f2539433 [formerly 5b4de19ebd] [formerly ddcc84262a [formerly ef9d97a4d0886df2072672b1cebc9b77e689308b]]
Former-commit-id: ddcc84262a
Former-commit-id: 874434cea9
2013-02-13 11:08:20 -06:00
Lee Venable
5db93bcf71 Merge "Issue #1606 Did not set default bullets for CORs." into development
Former-commit-id: d00a325041 [formerly ffd4bf0028] [formerly 3b8bb09da1 [formerly 15403138929b735070553ec08d4e44e4bfc1811e]]
Former-commit-id: 3b8bb09da1
Former-commit-id: bfcbfb3f00
2013-02-13 10:31:14 -06:00
Richard Peter
ba2c69fb17 Merge "Issue #1615 Changed ProcessEvent pluginName to dataType. Refactored GribDecoder decode method to a Processor exchange method." into development
Former-commit-id: edcf52d9c1 [formerly e92c1fe346] [formerly 671f961a99 [formerly 6574bb0978629fd9fac45b2f7eee1dc7a42d5156]]
Former-commit-id: 671f961a99
Former-commit-id: 351d52b311
2013-02-13 10:24:50 -06:00
Richard Peter
0804763d1a Merge "Issue #1526 refactor for clarity and to stream responses from pypies" into development
Former-commit-id: 7438d87e58 [formerly e611aab017] [formerly dbcb8bd30e [formerly a8d1d7259bf914fac127361bde67d6513f775e8f]]
Former-commit-id: dbcb8bd30e
Former-commit-id: 6ec1990bd9
2013-02-13 10:18:24 -06:00
Jonathan Sanchez
b6047c78bb Issue #1606 Did not set default bullets for CORs.
Former-commit-id: 0c3d09f230 [formerly a061ee1363] [formerly 0a8b38d8e9 [formerly 4eb79ee90cf684b8ae38404586a65f09742eb348]]
Former-commit-id: 0a8b38d8e9
Former-commit-id: bdcac83ac7
2013-02-13 10:08:01 -06:00
Lee Venable
6ecbdae667 Merge "Issue #1600 Correctly set the StormTrackData motion direction for a CAN and EXP." into development
Former-commit-id: 39351ec038 [formerly 0d1ebacc71] [formerly 10008011b4 [formerly c821cfcc556efb4586eb6e9122a90731a7f42083]]
Former-commit-id: 10008011b4
Former-commit-id: 44a4701c1e
2013-02-13 08:58:07 -06:00
Max Schenkelberg
27b8d411b7 Issue #1500 Fixed concurrent mod exceptions
Change-Id: I66c2bd159e7631a826a5bb9d0f06d0f3364a2f22

Former-commit-id: 599e3bd319 [formerly 7c3f0cc295] [formerly ccf58ba87e [formerly b7f6998ac508c65440c2969b78e45de8f19c0ad9]]
Former-commit-id: ccf58ba87e
Former-commit-id: 55f882b00f
2013-02-12 17:35:30 -06:00