Commit graph

2164 commits

Author SHA1 Message Date
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
Jonathan Sanchez
b4a7b7407b Issue #1600 Correctly set the StormTrackData motion direction for a CAN
and EXP.

Former-commit-id: cd8d9ff3db [formerly 6d463f0c74] [formerly c2a9e1c215 [formerly e82da0ee983f1a9889e25b088e2eadebb8c08fff]]
Former-commit-id: c2a9e1c215
Former-commit-id: e8f64e5121
2013-02-12 17:20:55 -06:00
Nate Jensen
b60f7b3c69 Merge "Issue #1570 add ability for synchronous operations in PythonJobCoordinator" into development
Former-commit-id: e2a5618795 [formerly 4393e42be9] [formerly 17645df404 [formerly bd8da9437128570e5dbecaca81a1c97953a32742]]
Former-commit-id: 17645df404
Former-commit-id: 5e5522f21b
2013-02-12 16:37:33 -06:00
Nate Jensen
54cea219cf Issue #1526 refactor for clarity and to stream responses from pypies
Change-Id: Ia07aca01a528b51de4fd20571edaa90cc06631d7

Former-commit-id: 56112143c3 [formerly 96232ab0ab] [formerly 92076242fc [formerly 26ba8a930a723ccbecdc09d873cbcb917e8b453e]]
Former-commit-id: 92076242fc
Former-commit-id: cbca34e709
2013-02-12 16:33:01 -06:00
Steve Harris
7c5e57d662 Merge branch 'ss_builds' (13.2.1-7) into development
Former-commit-id: 760be15f59 [formerly cc2757790c] [formerly de437bb4fc [formerly 62e4a9045e32eaaf1a52ff06d86f82d2693021bd]]
Former-commit-id: de437bb4fc
Former-commit-id: 3690662bf7
2013-02-12 15:30:10 -06:00
Steve Harris
2d04721c4b 13.2.1-7 baseline
Former-commit-id: 3f271af195 [formerly 2fb5a31b98] [formerly 6baff6a089 [formerly 85a6ac3debfd1691b5d44c547d76a7ae9e19523f]]
Former-commit-id: 6baff6a089
Former-commit-id: bac9b967aa
2013-02-12 15:27:30 -06:00
Steve Harris
6780b60df5 13.2.1-7 baseline
Former-commit-id: 0b7287b130 [formerly 6fad5da5ed] [formerly 9c23bf6e73 [formerly fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2]]
Former-commit-id: 9c23bf6e73
Former-commit-id: 6bfbfc8a5e
2013-02-12 14:51:26 -06:00
Brad Gonzales
666c728476 Issue #1615 Changed ProcessEvent pluginName to dataType. Refactored GribDecoder decode method to a Processor exchange method.
Change-Id: Ib3eaf4c319d844c277dd7288d565bb9508fa46f8

Former-commit-id: 465764854a [formerly 9917cb9f46] [formerly 26f2374d54 [formerly 6eff40bb823594da5346022eeffc15910cdfb799]]
Former-commit-id: 26f2374d54
Former-commit-id: ec6bfc0d5e
2013-02-12 13:49:18 -06:00
Matt Nash
e97b31bb7e Issue #1570 add ability for synchronous operations in PythonJobCoordinator
Change-Id: Ida7d53c8675dee57ef37e3544500b8306ecb54c4

Former-commit-id: 3b2fa3eafe [formerly ba3a70d02c] [formerly 85988ecfe6 [formerly f3f4604a64c797b998ffa7d4ccc574a0cc1dd633]]
Former-commit-id: 85988ecfe6
Former-commit-id: c0ce67463f
2013-02-12 13:39:44 -06:00
Nate Jensen
9fb05f0a96 Merge "Issue #1446 return None in Python if data is not available. Users will need to handle None, but it seems like this is better rather than return them an empty array and risk them searching through the empty array for values that are not there and getting more confused." into development
Former-commit-id: 2c516156f1 [formerly 207cca1edf] [formerly 4452a5d62f [formerly ec5a6b3d1ad551db73f3cd60eafe2b97267a6bdd]]
Former-commit-id: 4452a5d62f
Former-commit-id: 4e0e1fe65e
2013-02-12 12:15:37 -06:00
Dustin Johnson
85dfef2c57 Merge "Issue #1543 Clean up test files after changing to Spring transactions" into development
Former-commit-id: 9f5b5f5346 [formerly 5152c8f857] [formerly 583f76b366 [formerly add04e9858bcbd7a503c11606e1d4a820885f980]]
Former-commit-id: 583f76b366
Former-commit-id: f1f06d0b02
2013-02-12 12:12:40 -06:00
Lee Venable
df2608844d Merge "Issue #1612 export entries in .classpath for use in other unit test projects" into development
Former-commit-id: de0f6e822b [formerly a17db5ba02] [formerly c18ee2cad1 [formerly 57fbe95f1387c4e1dccca8889e2fc3bc568e33f5]]
Former-commit-id: c18ee2cad1
Former-commit-id: 01e13bcefb
2013-02-12 12:06:57 -06:00
Matt Nash
39f3f70e1b Issue #1446 return None in Python if data is not available. Users will need to handle None, but it seems like this is better rather than return them an empty array and risk them searching through the empty array for values that are not there and getting more confused.
Change-Id: I36d72ed9642752eb92ae0902892bd79810111c07

Former-commit-id: 2bed543d32 [formerly 1c504de33e] [formerly da21cf82e9 [formerly 4b56329756881b3291ad2856a5c166cdfc635bf9]]
Former-commit-id: da21cf82e9
Former-commit-id: d39f0938e8
2013-02-12 12:02:48 -06:00
Dustin Johnson
4a10957512 Issue #1543 Clean up test files after changing to Spring transactions
Change-Id: I83199fd60f0e84c4b6e7b9b400d9f7cafbc2c680

Former-commit-id: 651c6d55c1 [formerly 4bcd75c091] [formerly 19fd95d2c8 [formerly e7e146c79b11d33ad6755acdeb11f58fa789b4c6]]
Former-commit-id: 19fd95d2c8
Former-commit-id: b4367903b0
2013-02-12 11:59:45 -06:00
Nate Jensen
14424e1154 Merge "Issue #1604 fix null pointer on double clear in D2D." into development
Former-commit-id: ec55fe251a [formerly 75e3292b2b] [formerly e55eb5cc70 [formerly b8c34d0f645dec253188142c815efa7b3d428db6]]
Former-commit-id: e55eb5cc70
Former-commit-id: 8c1b88b3ef
2013-02-12 10:56:33 -06:00
Matt Nash
7d6914274d Issue #1612 export entries in .classpath for use in other unit test projects
Change-Id: I516da05d33cbfaad54775e30ef5ccd9df4c7f40c

Former-commit-id: 6405fa1eb1 [formerly 24993b08eb] [formerly 6e59cf2c5a [formerly ed7a54ecc71d16810b3fbd5ebebd1dc62e1bfe82]]
Former-commit-id: 6e59cf2c5a
Former-commit-id: b5d990bd0d
2013-02-12 10:24:53 -06:00
Dustin Johnson
e8f382e7c0 Merge "Issue #1554 fix XmlGenericMapAdapter to work with null maps." into development
Former-commit-id: ab7e404ffa [formerly 9004e0f57c] [formerly 5c1c1ec582 [formerly 2d2dd4cc62a45794a3a912eb75c9d2745815dc4e]]
Former-commit-id: 5c1c1ec582
Former-commit-id: 12b6ac3d56
2013-02-12 07:59:24 -06:00
Dustin Johnson
ecbd1896dc Merge "Issue #1543 Add testing of current OpenDAP type retrievals. - Add test for current behavior of SBN-like retrievals. - Change session management to use a factory implementation. - Add service locator strategy to find jaxbables. - Tests cleanup. - Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality." into development
Former-commit-id: bc8fb2f4ea [formerly 2457359c0f] [formerly 6a4a11536e [formerly 4d055580ddea29eb35983dbe4e9e01a611f23ba1]]
Former-commit-id: 6a4a11536e
Former-commit-id: da9072b0f1
2013-02-12 07:58:39 -06:00
Ron Anderson
1ec0410989 Merge "Issue #1554 initial implementation of GFE grid factory. Change-Id: Id2ae308c0c13822dd6e5dd0195f7920df82ff994" into development
Former-commit-id: dfe0723e65 [formerly 5bee722544] [formerly 9713b42306 [formerly 7c4d695201e473de349f4f5a83a1a5283d6cb4f4]]
Former-commit-id: 9713b42306
Former-commit-id: 184cd6d508
2013-02-11 17:20:21 -06:00
Ron Anderson
c862db5513 Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging.
Change-Id: I820a780dcbaa3e6ffefd56737bac7dbc13c2e485

Former-commit-id: 95d18f9283 [formerly 771296a845] [formerly b6a9b42094 [formerly 39282e6528aeb01a40a01df477f4579afab79ca3]]
Former-commit-id: b6a9b42094
Former-commit-id: 12b0fbdab8
2013-02-11 17:16:48 -06:00
Ben Steffensmeier
3b26d6213f Issue #1604 fix null pointer on double clear in D2D.
Former-commit-id: f2aa5e616b [formerly 9a6228e233] [formerly 589d94f4bf [formerly d1dfa9f85d4792d9906241eef2dcf6df8313c984]]
Former-commit-id: 589d94f4bf
Former-commit-id: 5d7f31ef41
2013-02-11 17:05:06 -06:00
Max Schenkelberg
ea89a7f161 Issue #1602 Merged menu changes and D2D Nsharp changes to support NUCAPS NPP changes
Change-Id: Ia3375d8c4e03ffa143a74c965c9cf40cb2649402

Former-commit-id: 8dee946fa7 [formerly 58c2417d9d] [formerly d610c1b862 [formerly ac58f7ba225688d0c2f56a8937e3477bf30bd8d1]]
Former-commit-id: d610c1b862
Former-commit-id: de70af581c
2013-02-11 16:11:34 -06:00
Ben Steffensmeier
ae0ac4e21c Issue #1554 fix XmlGenericMapAdapter to work with null maps.
Former-commit-id: 4a7d94ecbd [formerly 60c435861a] [formerly 7220c4c6cc [formerly 904e3387de59f534b6457c7a12e8f94d55974884]]
Former-commit-id: 7220c4c6cc
Former-commit-id: 21616e06ce
2013-02-11 16:08:58 -06:00
Nate Jensen
b9a7fcedaa Merge "Issue #1601 fix error" into development
Former-commit-id: 992c303bf0 [formerly 9b1472b368] [formerly 8abc835e59 [formerly 22c111e1b4df1236c086c20dac1d4975ed81ffeb]]
Former-commit-id: 8abc835e59
Former-commit-id: 7b4c1a05fe
2013-02-11 16:04:13 -06:00
Steve Harris
4bc81ce1de 13.2.1-7 baseline
Former-commit-id: 370b2558f0 [formerly 1ce95d1df2] [formerly c86246ab4d [formerly 132297ab4acf8e649e3cf9a3d54d4f4676b280be]]
Former-commit-id: c86246ab4d
Former-commit-id: 37be2e3f23
2013-02-11 16:50:39 -05:00
Nate Jensen
0abf696eee Issue #1601 fix error
Change-Id: Ia9749ff77222ea5f136fff7b5bf575b42c29906b

Former-commit-id: 762d2d54e1 [formerly a34a9941c7] [formerly e6b7bd9034 [formerly a893b0ea01e31e1c5c8b5048f536b59cc36ca810]]
Former-commit-id: e6b7bd9034
Former-commit-id: 5315c1d40a
2013-02-11 15:40:39 -06:00
Ben Steffensmeier
92eb21f91c Issue #1554 initial implementation of GFE grid factory.
Change-Id: Id2ae308c0c13822dd6e5dd0195f7920df82ff994

Former-commit-id: b5fa5d45fb [formerly f34751122a] [formerly ff13255ebe [formerly 0b350f62b26c9f2154a1d7bd6ba9d18475012495]]
Former-commit-id: ff13255ebe
Former-commit-id: 1663a758b8
2013-02-11 15:20:40 -06:00