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

4177 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Clements
7cba0ca3c1 Issue #2539 added GZIP support to WFS REST 
small code cleanup in providers


Former-commit-id: 02ab14579f [formerly 36a0be2db1] [formerly 061515b485 [formerly 943310ed8b34f62d73dee1dff32d5c3b9f424e3c]]
Former-commit-id: 061515b485
Former-commit-id: 24905af3c4
 2013-11-11 16:08:09 -06:00
Nate Jensen
06c24325c1 Merge "Issue #1314 removed common.spatial plugin" into development 
Former-commit-id: 0c25fe98bd [formerly 0dbc31b756] [formerly 06acf1b8a0 [formerly 823cb0e07793ec5baa1863088634a312364b3d8b]]
Former-commit-id: 06acf1b8a0
Former-commit-id: de2623e273
 2013-11-11 08:48:44 -06:00
Brad Gonzales
e802b866dd 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: 80fd8a2ad4 [formerly fe15e874f7] [formerly e2fb158757 [formerly 0b667fbd94788a8a5b598ae5f5586d4b710518a4]]
Former-commit-id: e2fb158757
Former-commit-id: 28d8aa5151
 2013-11-08 15:29:05 -06:00
Nate Jensen
6228d02608 Merge "Issue #2361 remove SerializationUtil from SoundingPrefs" into development 
Former-commit-id: 76ccc6f8f7 [formerly 89a650d94a] [formerly f57cc4ab8f [formerly 2622cf7de4bfa09734e8a0acca402ffb5f8b1fcb]]
Former-commit-id: f57cc4ab8f
Former-commit-id: 24d83fcb9a
 2013-11-08 14:45:22 -06:00
Brian Clements
90682b4beb Issue #1314 removed common.spatial plugin 
Moved KeyLocker to common.util
Updated query store to use read write lock


Former-commit-id: f994d9924d [formerly 8142ff770f] [formerly 04791b7939 [formerly 4f3d7e982a34f17fdf8cd80f025da176f939a3b1]]
Former-commit-id: 04791b7939
Former-commit-id: f96f92df0b
 2013-11-08 13:43:52 -06:00
Richard Peter
d54bdf1094 Merge "Issue #2361 fix saving hydro table objects" into development 
Former-commit-id: 931e583990 [formerly bded464ccf] [formerly cf261df489 [formerly 8a326cda9dd0b801f0bbaf779d6548f42078c0a5]]
Former-commit-id: cf261df489
Former-commit-id: 9bb4f8dd7f
 2013-11-08 13:26:06 -06:00
Nate Jensen
399265e3f8 Issue #2361 fix saving hydro table objects 
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de

Former-commit-id: 040f022e5d [formerly 7a27264094] [formerly 08441efbb7 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]]
Former-commit-id: 08441efbb7
Former-commit-id: 4958732cb2
 2013-11-08 12:37:26 -06:00
Nate Jensen
b10cc7b9b0 Issue #2361 remove ISerializableObject from persistence path keys 
Change-Id: I7ff7e5234c7c88ed475014c755f3df7d1ee23b16

Former-commit-id: 0e4a1d9ced [formerly 02d26d0f84] [formerly 44a6d5b302 [formerly 044f4fd87a83d6b83eef7f46854f1b484536c825]]
Former-commit-id: 44a6d5b302
Former-commit-id: 3ea850b9da
 2013-11-08 12:30:39 -06:00
Nate Jensen
f58ec24a85 Issue #2361 remove SerializationUtil from SoundingPrefs 
Change-Id: Ia394f825954c0d96e17431589d64af13d8c7f991

Former-commit-id: b01f5697d3 [formerly c3b37bcb7b] [formerly e9ca44ee64 [formerly eab1cf126b79ec5708facf2b2c9a303fca8a24fe]]
Former-commit-id: e9ca44ee64
Former-commit-id: 56335703ac
 2013-11-08 12:13:50 -06:00
Nate Jensen
8a27263b0c Issue #2361 fix map style preferences 
Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049

Former-commit-id: 058c963aa2 [formerly ec319b7dd0] [formerly 43bbf31347 [formerly 4a3ae6311f17e56d9ba095f80f5c6b6c2529c5ae]]
Former-commit-id: 43bbf31347
Former-commit-id: 5ecde78b02
 2013-11-08 10:38:11 -06:00
Richard Peter
990053c1fb Merge "Issue #2361 remove viz.grid ISerializableObjects" into development 
Former-commit-id: 44818e3dbd [formerly 214a72ac69] [formerly bb0dcf6d4a [formerly a227c2dcb2598f82756c3f6a9ac7999c06202177]]
Former-commit-id: bb0dcf6d4a
Former-commit-id: 1909b0d06b
 2013-11-08 10:35:41 -06:00
Slav Korolev
53b6d4aa69 Issue #2291. Fixed Shared Subscription Dialog. 
Former-commit-id: 2d002ccde3 [formerly 59d1de165d] [formerly 7b7754982c [formerly f04678733c2368ca05b7b8fdbcfeb096940854df]]
Former-commit-id: 7b7754982c
Former-commit-id: c4a633acde
 2013-11-08 11:09:21 -05:00
Nate Jensen
13f93cd7cf Issue #2361 remove viz.grid ISerializableObjects 
Change-Id: I76be90f90dedf5d5d5e3656d23bd1180de9014b8

Former-commit-id: bfc7c671cc [formerly 88eb0aab5c] [formerly 10548cd1c7 [formerly 6dde4cfe4f7669cd3d3ca15bbb7f4ab2a1a50e92]]
Former-commit-id: 10548cd1c7
Former-commit-id: 48a479d2dc
 2013-11-08 09:42:09 -06:00
Richard Peter
39a2c98779 Merge "Issue #1678 Added support for stored query publishing and invocation on the registry" into development 
Former-commit-id: 9111484d4f [formerly 60b567eeae] [formerly 6fd6fd0725 [formerly 003f889e8aa65c4f01287611518f92b7d8ef05dd]]
Former-commit-id: 6fd6fd0725
Former-commit-id: 65628daf36
 2013-11-08 09:35:08 -06:00
Benjamin Phillippe
bd3e4778c0 Issue #1678 Added support for stored query publishing and invocation on the registry 
Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f

Former-commit-id: 0abf405014 [formerly b84235a80a] [formerly b5db1f38c3 [formerly d7d985926351d933c0bd10a3a5fd88ef4305853b]]
Former-commit-id: b5db1f38c3
Former-commit-id: 1a492a564b
 2013-11-07 18:36:46 -06:00
Nate Jensen
77af220675 Merge "Issue #2515 upgraded camel from 2.11.0 to 2.11.2" into development 
Former-commit-id: 6ef029fba9 [formerly db5ee537a8] [formerly f677dd6415 [formerly cd816c1507ff5b413b6312fb6d7d83cff29436e1]]
Former-commit-id: f677dd6415
Former-commit-id: 1b7b698c31
 2013-11-07 16:59:35 -06:00
Brian Clements
83edfb5349 Issue #2515 upgraded camel from 2.11.0 to 2.11.2 
removed log showBody workaround


Former-commit-id: 6f0630aa55 [formerly 4f374688c8] [formerly ea6b162369 [formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]]
Former-commit-id: ea6b162369
Former-commit-id: a5b61b6d22
 2013-11-07 16:56:25 -06:00
Nate Jensen
97acbb8426 Merge "Issue #2361 remove ISerializableObject from datadelivery.retrieval" into development 
Former-commit-id: b9c95aadc0 [formerly f4fcd9e604] [formerly 7877229eac [formerly 7c4748fa0348820f0cf65330889253a04b4fab28]]
Former-commit-id: 7877229eac
Former-commit-id: 1de52a9ea8
 2013-11-07 16:39:50 -06:00
Ron Anderson
6636ebeb2d Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development 
Former-commit-id: c611ab48be [formerly 12192b633f] [formerly c1bda09fd9 [formerly c5da4c8a79432aab321d42f94b9cff04866671aa]]
Former-commit-id: c1bda09fd9
Former-commit-id: d2cd7c1257
 2013-11-07 14:39:06 -06:00
Ron Anderson
9d56a36dbe Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development 
Former-commit-id: 0bfd9a1c98 [formerly a5bc64473a] [formerly 42229b8eee [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]]
Former-commit-id: 42229b8eee
Former-commit-id: 6442e2e933
 2013-11-07 14:38:39 -06:00
Richard Peter
c97efbf656 Merge branch 'omaha_13.5.3' (13.5.3-5) into development 
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java

Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9

Former-commit-id: 25df870b67 [formerly fa7d77ae97] [formerly 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]
Former-commit-id: 93c776022a
Former-commit-id: 520dd57f02
 2013-11-07 14:25:45 -06:00
Nate Jensen
0c9d826ab4 Issue #2361 remove ISerializableObject from datadelivery.retrieval 
Change-Id: I9ec15b17760bcb4382898101f10ce1b17f55eb39

Former-commit-id: 6c1c3d77be [formerly 852751784b] [formerly 6abe031dfe [formerly 0cc1dd3988f7d02d609246dba863552b46127db2]]
Former-commit-id: 6abe031dfe
Former-commit-id: afcbc9e01a
 2013-11-07 13:18:21 -06:00
Nate Jensen
286c7a8b1c Issue #2361 speed up map initialization by moving field queries off UI 
thread

Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5

Former-commit-id: a52e7b677f [formerly d4b6ad1eee] [formerly cc2998b487 [formerly 75c1037145b0aec9cd5e0c0707f0904f4b703bc3]]
Former-commit-id: cc2998b487
Former-commit-id: ce583a88fb
 2013-11-07 11:44:07 -06:00
David Gillingham
1ed80f471c Issue #2476: Fix indent error in SmartScript._getGridsResult(). 
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67

Former-commit-id: 3df38a8d41 [formerly e1df69e312] [formerly 0e74638eb2 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]
Former-commit-id: 0e74638eb2
Former-commit-id: d0b188d577
 2013-11-07 11:36:49 -06:00
Nate Jensen
adde0aee83 Merge "Issue #2514 updated comments and history for OGC classes" into development 
Former-commit-id: 852dfae29c [formerly e84d6cf1b5] [formerly 3c335ed78f [formerly 5e5b1b53cf79fd058f65451aee4f255a73252ca1]]
Former-commit-id: 3c335ed78f
Former-commit-id: 5866e416f6
 2013-11-07 10:45:03 -06:00
Nate Jensen
1a6dad4c53 Merge "Issue #2530 Fixed ingest JVM crash on startup" into development 
Former-commit-id: a2a43a55a6 [formerly 0797f54a93] [formerly 7b18c745d3 [formerly ba63e0d32f333fb2acaee2b15253f7cffb7122d4]]
Former-commit-id: 7b18c745d3
Former-commit-id: f3d235a3f8
 2013-11-07 10:44:46 -06:00
Benjamin Phillippe
1a8d9bf754 Issue #2530 Fixed ingest JVM crash on startup 
Change-Id: Ia3256e509d3ecea06e7c1736330987a8db5bafa3

Former-commit-id: 8d47d1bbd4 [formerly 7d605c471e] [formerly 3561293fdd [formerly 0cf0136f3cb25328d3a65d15a12cd0a4f4867fcb]]
Former-commit-id: 3561293fdd
Former-commit-id: a9f8468c0e
 2013-11-07 10:38:53 -06:00
Nate Jensen
c27c435cea Merge "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" into development 
Former-commit-id: b01d5b16e0 [formerly f5feb9330f] [formerly 38a5ae5e5f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: 1b7ac545f8
 2013-11-07 10:21:42 -06:00
Dave Hladky
f62685926a Issue #2529 Move DD edex event plugin from DD feature to DD core feature. 
Former-commit-id: 1a5ddfbd5e [formerly f6996f9f5a] [formerly 5d3023d2f5 [formerly cce7fc47a0a4cdb55712ee3af942e93cb8a7c797]]
Former-commit-id: 5d3023d2f5
Former-commit-id: 5891412fb3
 2013-11-07 10:08:01 -06:00
Nate Jensen
2f4c4833d3 Merge "Issue #2511 fix for edex localization adapter to allow filename to appear in path" into development 
Former-commit-id: 812f3fefce [formerly 348a968aed] [formerly 68c7d378cf [formerly c2ca50713aa5e69aecdc6a5a0b04c7261305514c]]
Former-commit-id: 68c7d378cf
Former-commit-id: d1f45128aa
 2013-11-07 09:15:02 -06:00
Bryan Kowal
cdf643510a 13.5.3 build "fix" 
Former-commit-id: 503762af19 [formerly 6692b985f3] [formerly a28133117c [formerly 084e906e9f85ebd11cabf6e14e94ac75d25a0af2]]
Former-commit-id: a28133117c
Former-commit-id: ce6d80409d
 2013-11-06 18:25:10 -06:00
Nate Jensen
048d52722f Merge "Issue #2493 remove mesowest." into development 
Former-commit-id: 7c0d9a7df8 [formerly 0f4ba6f90e] [formerly 1da0e31b88 [formerly 2c506552014e60344c5b2014bed32edab2630f47]]
Former-commit-id: 1da0e31b88
Former-commit-id: aef895c447
 2013-11-06 17:07:10 -06:00
Brian Clements
e74f7e2483 Issue #2514 updated comments and history for OGC classes 
removed dead and duplicate code from OGC


Former-commit-id: 4a673c2896 [formerly 308b06a47a] [formerly 525da47317 [formerly c13d5788a39898ef746b535d959bc845b6acad9c]]
Former-commit-id: 525da47317
Former-commit-id: d1207aa0b5
 2013-11-06 16:07:22 -06:00
Richard Peter
082a8d0a94 Merge "Issue #2478: Remove blank lines in debug" into omaha_13.5.3 
Former-commit-id: 436389b782 [formerly aa82fb8c91] [formerly cf7c70beac [formerly a3130561e8705464873251575f569d6be95ade3d]]
Former-commit-id: cf7c70beac
Former-commit-id: 0e48596ca7
 2013-11-06 16:04:20 -06:00
Richard Peter
b62dd96321 Issue #2478: Remove blank lines in debug 
Former-commit-id: f099fb6936 [formerly 357eb79519] [formerly 18eff02d7a [formerly 489528b7869254f69ea65391b576e82e67cbfc8f]]
Former-commit-id: 18eff02d7a
Former-commit-id: 46f19c22ea
 2013-11-06 16:03:45 -06:00
Bryan Kowal
cdf1cb2ac6 Merge branch 'omaha_13.5.3' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_13.5.3 
Former-commit-id: cd3e1d7aa4 [formerly d26d6a396f] [formerly 100e14439e [formerly b171b7e66031ef05d98cb9a0819df6717acf0ba6]]
Former-commit-id: 100e14439e
Former-commit-id: 40c3059cc2
 2013-11-06 15:58:06 -06:00
Bryan Kowal
0b006511dc Fix 13.5.3 build; eliminate mix of EDEX and CAVE features 
Former-commit-id: 0f104b0365 [formerly 4f1c083032] [formerly bb15605aa2 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]
Former-commit-id: bb15605aa2
Former-commit-id: 0bc8cdc9be
 2013-11-06 15:57:14 -06:00
Richard Peter
6e929c0dee Issue #2478: Update log message 
Former-commit-id: d4bf633bd2 [formerly f9faa53eb4] [formerly b0746db723 [formerly ab993718b7e4f2b77461226a49bee76813166dbb]]
Former-commit-id: b0746db723
Former-commit-id: f1a67f4dc1
 2013-11-06 15:45:23 -06:00
Lee Venable
9a8a813cf8 Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development 
Former-commit-id: 326e4e31a7 [formerly 8585080cd1] [formerly 20726d4e7c [formerly 13672783e6a5e452cb4105669a98708329b35541]]
Former-commit-id: 20726d4e7c
Former-commit-id: 0c4566c411
 2013-11-06 15:42:40 -06:00
Nate Jensen
e4c3c3a2ad Merge "Issue #2525 GSD doesn't want "/wfs" appended by the DPA. Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370" into development 
Former-commit-id: 53e94b4bdc [formerly 4309555b45] [formerly eae6b2526d [formerly a6cf090becd6da2c3fba1a2d46297c475be9d610]]
Former-commit-id: eae6b2526d
Former-commit-id: ed9515eea8
 2013-11-06 15:41:29 -06:00
Lee Venable
55b68b6d2a Merge "Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects." into development 
Former-commit-id: ac2630eed4 [formerly ea5470af90] [formerly e80418a639 [formerly 10789718f6ece30c3d766ec95b9fff0a5c03ee2c]]
Former-commit-id: e80418a639
Former-commit-id: fab0fab6a9
 2013-11-06 15:41:02 -06:00
Nate Jensen
8cacf1c915 Merge "Issue #2522 removing WCS and WMS from baseline" into development 
Former-commit-id: 327f44aaff [formerly 1020b453f2] [formerly f3ea98778e [formerly c4f29baf5ac830404a7e7739626b9a861844ec06]]
Former-commit-id: f3ea98778e
Former-commit-id: 3169c86070
 2013-11-06 15:40:16 -06:00
Dave Hladky
7ddd6d4c61 Issue #2525 GSD doesn't want "/wfs" appended by the DPA. 
Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370

Former-commit-id: 62cd5b514d [formerly b0d929231c] [formerly b2b44cd1d2 [formerly 03cfdbd4c8c74da4200781b8b716181eac759195]]
Former-commit-id: b2b44cd1d2
Former-commit-id: 35bc4378ca
 2013-11-06 15:23:02 -06:00
Max Schenkelberg
e4b7f3618c 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: d7c8b8f662 [formerly 3369fbec2d] [formerly c28fd2b38d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]
Former-commit-id: c28fd2b38d
Former-commit-id: d53db3ddb6
 2013-11-06 15:07:18 -06:00
Richard Peter
b10d5952c0 Merge "Issue #2494 Updated to use thread logger" into development 
Former-commit-id: 3c49575ca0 [formerly 22bd1521be] [formerly 10160e3783 [formerly 8eb668a14e1674b3a67816c26b2baeb7c8f45fba]]
Former-commit-id: 10160e3783
Former-commit-id: 88dbe31908
 2013-11-06 14:03:34 -06:00
Richard Peter
e480cefa56 Merge "Issue #2450 - Send notifications to Notification Center when subscriptions expire. peer review comments" into development 
Former-commit-id: a699fed28b [formerly 2e162de539] [formerly d9c878bc51 [formerly e52828f36303bd39521381149b0f585b6eb38439]]
Former-commit-id: d9c878bc51
Former-commit-id: cdc4a81cc5
 2013-11-06 14:02:51 -06:00
Richard Peter
6b8bea4af5 Merge "Issue #2499: Fix build" into omaha_13.5.3 
Former-commit-id: b4a0f11c66 [formerly 27aa0dd6ba] [formerly 6ccb444219 [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]
Former-commit-id: 6ccb444219
Former-commit-id: f4bdb0caea
 2013-11-06 13:44:11 -06:00
Ben Steffensmeier
5d31aad5c2 Issue #2493 remove mesowest. 
Former-commit-id: f761c701cf [formerly d0b7966458] [formerly 36916fedcd [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]
Former-commit-id: 36916fedcd
Former-commit-id: baebe37ba6
 2013-11-06 13:42:38 -06:00
Slav Korolev
8fbf625667 Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects. 
Former-commit-id: cc90a7af4b [formerly 076865bb61] [formerly c25204d75b [formerly 04a119deb8248366e9efe9b5ac19c76e60a925e2]]
Former-commit-id: c25204d75b
Former-commit-id: 3223cd19cd
 2013-11-06 14:38:55 -05:00
Matt Nash
14e606f17d Issue #2511 fix for edex localization adapter to allow filename to appear in path 
Change-Id: I9fea157a67799e1168d4b5f7efaf5ef6cdd64933

Former-commit-id: 5ab51caf38 [formerly 19bfe014c9] [formerly b3ac4b7a9c [formerly 8404299627c7d27731910821befc068767c43aa1]]
Former-commit-id: b3ac4b7a9c
Former-commit-id: 65696b4148
 2013-11-06 13:35:11 -06:00