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

4199 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Peter
d66aaa7746 Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development 
Former-commit-id: 4d82382054 [formerly 8afc87e570] [formerly 61fc3eba44 [formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]]
Former-commit-id: 61fc3eba44
Former-commit-id: b8b01f6305
 2013-11-12 11:18:56 -06:00
Nate Jensen
ddebd81c73 Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development 
Former-commit-id: 3480148f14 [formerly bca5793e3d] [formerly da8a858727 [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]]
Former-commit-id: da8a858727
Former-commit-id: d758e5ab57
 2013-11-12 10:55:40 -06:00
Brad Gonzales
1987184f87 Issue #2506 Added subscription notification service to bandwidth manager. 
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92

Former-commit-id: cbdb9dfb4f [formerly cd221e5263] [formerly ff5edde334 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]]
Former-commit-id: ff5edde334
Former-commit-id: efdc64b7b3
 2013-11-12 10:50:06 -06:00
Nate Jensen
5899801877 Merge "Issue #2377 fixed error handling in QPF config" into development 
Former-commit-id: 74d7dfd7da [formerly 3054868350] [formerly d8f2ffbceb [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]]
Former-commit-id: d8f2ffbceb
Former-commit-id: 68866c322c
 2013-11-12 10:39:51 -06:00
Nate Jensen
f240b80d6f Merge "Issue #2539 added GZIP support to WFS REST" into development 
Former-commit-id: cd5b0576b0 [formerly f1b8eecca7] [formerly 8c4608630d [formerly e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3]]
Former-commit-id: 8c4608630d
Former-commit-id: b87efc6860
 2013-11-12 10:39:44 -06:00
Nate Jensen
9bf83be7e9 Issue #2361 remove using SerializationUtil for processing XML colormaps 
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: 2c0c20f01e [formerly b52bdb1cec] [formerly 7a73c65430 [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]
Former-commit-id: 7a73c65430
Former-commit-id: 5427e68fd2
 2013-11-12 10:37:54 -06:00
Nate Jensen
c84ff18213 Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development 
Former-commit-id: 8ff0d1129a [formerly 3ed50ff500] [formerly 23fe7de462 [formerly 7a8934c9005f25a16874be26e06625d56df5c024]]
Former-commit-id: 23fe7de462
Former-commit-id: 90320ab47a
 2013-11-12 09:29:46 -06:00
Bryan Kowal
1a966d8ec2 Issue #2540 - finish implementing the python override capability. The pure-python solution will be checked in later. 
Amend: addressed review comments
Amend: update DR number

Change-Id: I5ae0c1140e0c90be002e3e3711fc4311ce1a05f0

Former-commit-id: 6b5f93117e [formerly 8e1c0fb8eb] [formerly 75e6914df1 [formerly 315ca002de4045f0d7ae6b298012365a052a7430]]
Former-commit-id: 75e6914df1
Former-commit-id: 5c38f0bfd6
 2013-11-11 17:00:17 -06:00
Brian Clements
368223de1f Issue #2377 fixed error handling in QPF config 
Former-commit-id: 23e9ac6aa8 [formerly e2ac7ae212] [formerly 684bd4dc50 [formerly 8e8c57301c6167fa161fd55be0e3fae3f974918b]]
Former-commit-id: 684bd4dc50
Former-commit-id: c6f8609b39
 2013-11-11 16:18:16 -06:00
Nate Jensen
e1138809e7 Issue #2361 undo earlier changes that potentially break uengine based 
local apps

Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65

Former-commit-id: bb93c18e7d [formerly 8628b7755e] [formerly a2935193b5 [formerly 110cff66bb2cf847730562570a9415851e0362c2]]
Former-commit-id: a2935193b5
Former-commit-id: 9dc69e316f
 2013-11-11 16:14:35 -06:00
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
Steve Harris
48997c36f0 Merge branch 'omaha_13.5.3' into development 
Former-commit-id: 51af205d06 [formerly 9dabbc7b8e] [formerly 66f99f3974 [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]]
Former-commit-id: 66f99f3974
Former-commit-id: 9f1d93a2cf
 2013-11-11 15:40:45 -06:00
Steve Harris
5b789ef8b0 Merge branch 'master_13.5.3' into omaha_13.5.3 
Former-commit-id: 00a64f061d [formerly c1dcded2bd] [formerly e0d2de3a19 [formerly d55e0256167a6b61728d77403805ccc1c3eafdf7]]
Former-commit-id: e0d2de3a19
Former-commit-id: 0d4e6712f8
 2013-11-11 15:39:27 -06:00
Steve Harris
142f1201b3 13.5.3-7 baseline 
Former-commit-id: 36af5686bd [formerly 21bed95fa4] [formerly 47102ee47b [formerly a9ada72dc63cd460499052171c61323b438bb10d]]
Former-commit-id: 47102ee47b
Former-commit-id: 3599d7f09b
 2013-11-11 16:33:51 -05:00
Nate Jensen
208cc6a534 Merge "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." into development 
Former-commit-id: a3fd84d9ef [formerly 7dda17a660] [formerly 05ee46c4bc [formerly 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec]]
Former-commit-id: 05ee46c4bc
Former-commit-id: 64df0d8d8f
 2013-11-11 14:05:11 -06:00
Richard Peter
0e1ec70a0d Merge "Issue #2506 Refactored RegistryEvent constructors." into development 
Former-commit-id: d55e99dc2d [formerly 13989d9c6e] [formerly 51649b56e5 [formerly dd8f83135b04ff4510b1f860846f1a6a3db09f47]]
Former-commit-id: 51649b56e5
Former-commit-id: 8db2d589e3
 2013-11-11 13:09:24 -06:00
Steve Harris
4e09ce78c8 Merge branch 'omaha_13.5.3' (13.5.3-6) into development 
Former-commit-id: 33e02b548d [formerly fbfe1a5faf] [formerly 8a2e9f1725 [formerly a4c8e9a5fb9d50844da854e453b6146c2a6e75c3]]
Former-commit-id: 8a2e9f1725
Former-commit-id: b4fe17406f
 2013-11-11 11:45:35 -06:00
Steve Harris
0822dd1682 Merge branch 'master_13.5.3' into omaha_13.5.3 
Former-commit-id: 9923b2c71a [formerly b62ab264f0] [formerly 4190ddf39b [formerly 9d433d2ae29831903e8da23a4b96aee29ee8f5bd]]
Former-commit-id: 4190ddf39b
Former-commit-id: 590d7de15d
 2013-11-11 11:40:03 -06:00
Steve Harris
8705c4779b 13.5.3-6 baseline 
Former-commit-id: 11ca17a63c [formerly 77a45660d5] [formerly 5fa893d37b [formerly 1324512098c1b95d023de932c6fbe872cfeb68f8]]
Former-commit-id: 5fa893d37b
Former-commit-id: f31112871c
 2013-11-11 12:34:10 -05:00
Max Schenkelberg
3f3b244b0d 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: 2f794486e3 [formerly e58a5df04b] [formerly bd903f6641 [formerly 58ccc575973ea9a1778659e17daff8577747dec5]]
Former-commit-id: bd903f6641
Former-commit-id: c85532a180
 2013-11-11 11:09:00 -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
04c4b2a4cd Issue #2506 Refactored RegistryEvent constructors. 
Amend: Added call to default constructor in Event initialization constructor.

Change-Id: I4c3f105b9782512f6c0b73f2355767e855845454

Former-commit-id: adc09b748d [formerly 9e8420b216] [formerly d80183edc1 [formerly f4cb28f209073788a3c329c44283c8c8cf3bf70f]]
Former-commit-id: d80183edc1
Former-commit-id: 86f5c2b6ec
 2013-11-08 15:46:40 -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
Steve Harris
687b0848ee Merge branch 'master_13.5.3' into omaha_13.5.3 
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: dbd8615fc6 [formerly b93c4d7cd0] [formerly 47778131b0 [formerly 433ccf0db5946e18c81e20ec689c9911868fe4c2]]
Former-commit-id: 47778131b0
Former-commit-id: 079a007217
 2013-11-07 11:32:42 -06:00
Steve Harris
d9efe087e5 13.5.3-5 baseline 
Former-commit-id: 5b3cd9befd [formerly 06b5e0e0ec] [formerly f175680b89 [formerly 427119d391ffb23c0db3fa0dab0a893322a60f8c]]
Former-commit-id: f175680b89
Former-commit-id: 31b57882cb
 2013-11-07 12:22:32 -05: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