Commit graph

2703 commits

Author SHA1 Message Date
Nate Jensen
6b9fa8445b Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: c5e226e268 [formerly 1fcbeb41c9] [formerly 08b9ce4c62] [formerly c5e226e268 [formerly 1fcbeb41c9] [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]]
Former-commit-id: 6f1684b85c
Former-commit-id: 575b6335c3 [formerly dac803ca07] [formerly 1baaa254282ed154b97e2ddd86e72bbfaeb0e555 [formerly 22c23492c4]]
Former-commit-id: ab22f7f711aa7fbda2856f8ecf6ccf6a6defb61d [formerly 925339b84c]
Former-commit-id: 0080d492e2
2013-05-14 16:16:13 -05:00
Roger Ferrel
1c434f4901 Issue #1966 Initial setup.
Change-Id: I9b63433524fe419099e5646d028391377784d193

Former-commit-id: ab2caee84c [formerly fad208e0ee] [formerly 0a02d5e018] [formerly ab2caee84c [formerly fad208e0ee] [formerly 0a02d5e018] [formerly 9f9f85f875 [formerly 0a02d5e018 [formerly e36e62d3c146f10ef20a0d84abd26a96b9740827]]]]
Former-commit-id: 9f9f85f875
Former-commit-id: c233a43561 [formerly fb15e2d0a6] [formerly 1979b4a6badaebd7c518bd6e2d3e6e39ee777737 [formerly ab75cd5107]]
Former-commit-id: 781e3641b1d9f236c4e0b0f924f6e0472f4ad74c [formerly 532787c043]
Former-commit-id: 4dbb2fda4a
2013-05-14 13:49:53 -05:00
Richard Peter
1ecaa93d18 Merge "Issue #1869 Modified D2D height Graphs to work without dataURI column." into development
Former-commit-id: 3a6d627a69 [formerly 7683bfd122] [formerly 57d6790d5e] [formerly 3a6d627a69 [formerly 7683bfd122] [formerly 57d6790d5e] [formerly 6c406d6a8e [formerly 57d6790d5e [formerly 4503fe27c4760d681a3026fd0d9b4fd77f1b13cb]]]]
Former-commit-id: 6c406d6a8e
Former-commit-id: 0bb437873f [formerly b4e46593a8] [formerly 261e579f04551c139fed42c204c4a8c3d9be208b [formerly 3309e0c3b7]]
Former-commit-id: d16a7bd63c965117fe1af4e955370487108040eb [formerly a734c8594a]
Former-commit-id: 5f097830db
2013-05-14 09:40:21 -05:00
Richard Peter
657ab54ec3 Merge "Issue #1869 Remove DataURI column from GFE. Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488" into development
Former-commit-id: 012b3554a6 [formerly 9bf35d621a] [formerly 2f4b1d54a1] [formerly 012b3554a6 [formerly 9bf35d621a] [formerly 2f4b1d54a1] [formerly b76d402c98 [formerly 2f4b1d54a1 [formerly f7d2c39ca0c70b627b2e72f5982fba11a6a683bd]]]]
Former-commit-id: b76d402c98
Former-commit-id: 421523312b [formerly 824407f930] [formerly be0704603aa06bbc18e627d6fbecdc0faa7ef388 [formerly 17407e863a]]
Former-commit-id: bac7ecf2828aa3aa56f728f10c11738b28b303ba [formerly b7fc98ce28]
Former-commit-id: 848cd582e9
2013-05-14 09:37:18 -05:00
Ben Steffensmeier
b577c72634 Issue #1869 Modified D2D height Graphs to work without dataURI column.
Former-commit-id: 51d638c7d3 [formerly 4d3f9ee7d0] [formerly f856d0e02b] [formerly 51d638c7d3 [formerly 4d3f9ee7d0] [formerly f856d0e02b] [formerly 1d900e6b94 [formerly f856d0e02b [formerly acb500b1581d4725eb31e73b362fd523752b11d9]]]]
Former-commit-id: 1d900e6b94
Former-commit-id: 246c696a0c [formerly edcd8df871] [formerly 33d95552094ab81225c39706c24033b1385d6730 [formerly d0e1ff7ce3]]
Former-commit-id: bb43a8aeb3d4f463c7829c813e5a3dfec8e5a8fb [formerly 386ba183bf]
Former-commit-id: 81f1cbfdbd
2013-05-13 18:33:24 -05:00
Ben Steffensmeier
7b8c567978 Issue #1869 Remove DataURI column from GFE.
Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488

Former-commit-id: d18ca94fe5 [formerly 35da7528bf] [formerly 2536042f6d] [formerly d18ca94fe5 [formerly 35da7528bf] [formerly 2536042f6d] [formerly 8661bde0cc [formerly 2536042f6d [formerly 4c35aa22bdd5058992984eca824083e927d8deda]]]]
Former-commit-id: 8661bde0cc
Former-commit-id: 7c6b15e731 [formerly c6d8809f87] [formerly b2435c4d7c07b9baad1b96408593aa5885e2d2bf [formerly 039a92d9b9]]
Former-commit-id: 5724ab14d4328750679c29594ded9abf07624b2a [formerly d78e7bcd78]
Former-commit-id: ba5555930e
2013-05-13 17:35:00 -05:00
Richard Peter
dd2ceed4ae Merge branch 'omaha_13.4.1' (13.4.1-7) into development
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: 207c17d5af [formerly 2c009eb618] [formerly a12830f762] [formerly 207c17d5af [formerly 2c009eb618] [formerly a12830f762] [formerly c5040038d3 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]]
Former-commit-id: c5040038d3
Former-commit-id: 994357c357 [formerly 6c09ab9bdf] [formerly 4a7cd13915319fef7cf3e6405d041ffee0348571 [formerly bcf4dcc810]]
Former-commit-id: 10a9ca07796d13205616f7696c5af614917400a1 [formerly f7470fbd8f]
Former-commit-id: c7755a649b
2013-05-13 17:11:05 -05:00
Richard Peter
8083ef6c71 Merge branch 'master_13.4.1' (13.4.1-7) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFELockDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendJob.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/blocks/RedbookBlockBuilder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
	nativeLib/files.native/adapt/climate/bin/Linux/ASOS_smDecoder
	nativeLib/files.native/adapt/climate/bin/Linux/build_f6
	nativeLib/files.native/adapt/climate/bin/Linux/create_climate
	nativeLib/files.native/adapt/climate/bin/Linux/display_climate
	nativeLib/files.native/adapt/climate/bin/Linux/do_all_climate
	nativeLib/files.native/adapt/climate/bin/Linux/format_climate
	nativeLib/files.native/adapt/climate/bin/Linux/init_climate
	nativeLib/files.native/adapt/climate/bin/Linux/qc_climate
	nativeLib/files.native/adapt/climate/bin/Linux/recordClimate
	nativeLib/files.native/adapt/climate/bin/Linux/set_up_climate
	nativeLib/files.native/edex/lib/native/linux32/libXm.so
	nativeLib/files.native/edex/lib/native/linux32/libXm.so.2
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
	nativeLib/files.native/edex/lib/native/linux32/libtcl.so
	nativeLib/files.native/edex/lib/native/linux32/libtk.so
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Change-Id: Idddce3fffab060f0eeaf69c3df825af0a6edd23e

Former-commit-id: b374309faf [formerly 4ae23b93d9] [formerly 8062c38b71] [formerly b374309faf [formerly 4ae23b93d9] [formerly 8062c38b71] [formerly ba590e2f93 [formerly 8062c38b71 [formerly 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc]]]]
Former-commit-id: ba590e2f93
Former-commit-id: b2b66da141 [formerly faf22cc925] [formerly 845e355d3758a8223bad200d62847aef296e66cc [formerly 8e5929406c]]
Former-commit-id: 77b1abb6a3a5f5a94bfd365fc6227f35dbc435c5 [formerly 4b5869684b]
Former-commit-id: 9623d4c82e
2013-05-13 16:33:50 -05:00
Dustin Johnson
1bc6c5d661 Merge "Issue #1948 Modified registry permgen memory size to accomodate additional Spring container" into development
Former-commit-id: 8c31b75ff5 [formerly 23fa59f25b] [formerly 0b2bdf1848] [formerly 8c31b75ff5 [formerly 23fa59f25b] [formerly 0b2bdf1848] [formerly ab755981a9 [formerly 0b2bdf1848 [formerly 46b88ec783b7721448940f158e5eb2ad168a3a97]]]]
Former-commit-id: ab755981a9
Former-commit-id: fa132f89c3 [formerly 82a35120b8] [formerly 31893e63d3fb90ba4e62961c1b180bf1ba75acaf [formerly 0796694014]]
Former-commit-id: b07b41661425802a088b7775032457c4e8fcd528 [formerly a6532af8c9]
Former-commit-id: c284d00e3d
2013-05-13 15:26:19 -05:00
Benjamin Phillippe
a281ffec70 Issue #1948 Modified registry permgen memory size to accomodate additional Spring container
Change-Id: I0492d5440f6753896fa6b278f0cf642a2ef13d65

Former-commit-id: 04de3a97bf [formerly 037b40e59a] [formerly 5a113f1c43] [formerly 04de3a97bf [formerly 037b40e59a] [formerly 5a113f1c43] [formerly 4165759e58 [formerly 5a113f1c43 [formerly 4e375316f389f1db4b21708893c0087587c3f3e9]]]]
Former-commit-id: 4165759e58
Former-commit-id: cdc4d7a1b8 [formerly 9768a187f9] [formerly c8137a14242feb12d84eb7718a3f6a0287d7be37 [formerly 2768c62541]]
Former-commit-id: 1e9bdaacbcb88947b074bdd8861f0e3b719be7cf [formerly b8a47cc9be]
Former-commit-id: 38caf6c225
2013-05-13 15:20:28 -05:00
Steve Harris
a2c35a5f3f 13.4.1-7 baseline
Former-commit-id: 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]]
Former-commit-id: 8347bed50e
Former-commit-id: 6e1e454a9f [formerly ff7a21ac37] [formerly f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661]]
Former-commit-id: fa4cea9874a8ab4f41eefd7e3ce4a2ea2b2883b4 [formerly dffa6d3bdc]
Former-commit-id: c7c6ea343e
2013-05-13 12:58:10 -04:00
Ben Steffensmeier
6146cdb6a7 Issue #1993 Explicitly specify levels for CapeStk Derived parameter.
Former-commit-id: 1823c1850c [formerly 926da8983e] [formerly e5fc3f3835] [formerly 1823c1850c [formerly 926da8983e] [formerly e5fc3f3835] [formerly 598ce2ae6c [formerly e5fc3f3835 [formerly 1d5f8f6514129ca7dc1ba2607c92d92cc2f60937]]]]
Former-commit-id: 598ce2ae6c
Former-commit-id: c9c011aecc [formerly bb257fc9e5] [formerly f1b73d9e52924ffdea1445f4fde629bcef0cc742 [formerly b4c645f99f]]
Former-commit-id: 80fd9099ac8e1ac91feebe6357d012569d5239f4 [formerly 62db2bdcd3]
Former-commit-id: 85eda2ea78
2013-05-13 11:42:54 -05:00
Richard Peter
795becb3e2 Merge "Issue #1869 Modified D2D time series of point data to work without dataURI. Change-Id: I80f39877903e50338add58700f6ffeb39e848a32" into development
Former-commit-id: bb6090df3f [formerly f8881f6e02] [formerly 18c5ad2727] [formerly bb6090df3f [formerly f8881f6e02] [formerly 18c5ad2727] [formerly 045a8c0b5d [formerly 18c5ad2727 [formerly ac7b7bdf702eb75bb41631febe433354acf78589]]]]
Former-commit-id: 045a8c0b5d
Former-commit-id: 56c6ad458d [formerly e6c820c2c5] [formerly 49c3308fa18b7030ca7a2ae7164c607dd5dd6af7 [formerly c598cd3be0]]
Former-commit-id: c6a924d713336c420ff609ff4f8cc734aa152367 [formerly 570a330497]
Former-commit-id: aa83bde84c
2013-05-13 11:42:23 -05:00
Ben Steffensmeier
6e978ea97a Issue #1869 Modified D2D time series of point data to work without dataURI.
Change-Id: I80f39877903e50338add58700f6ffeb39e848a32

Former-commit-id: 019f4ce7ef [formerly 8e550124f4] [formerly 2b4dd1521b] [formerly 019f4ce7ef [formerly 8e550124f4] [formerly 2b4dd1521b] [formerly baf051a27e [formerly 2b4dd1521b [formerly 3f246d2d473050ae89a4db65bc01d7729dc0aa01]]]]
Former-commit-id: baf051a27e
Former-commit-id: e261ac41b8 [formerly c862d04d57] [formerly 1be14a07a2404076176e3055753709833e1992be [formerly 9aab9c6034]]
Former-commit-id: ad99a5e496076dba6fb0e2b8b555e8d90b2cc790 [formerly e17c6f6857]
Former-commit-id: c917c7f592
2013-05-13 11:26:47 -05:00
Mike Duff
4bf51528c4 Issue #1919 - Fix VGBs in FFMP
Former-commit-id: 66f929fb14 [formerly d087b03eb3] [formerly f887a41875] [formerly 66f929fb14 [formerly d087b03eb3] [formerly f887a41875] [formerly 7874521269 [formerly f887a41875 [formerly f5ab8a230b2c63bd025d32a2364a52b3536536d4]]]]
Former-commit-id: 7874521269
Former-commit-id: 8fa2b8ce8c [formerly 311ce09129] [formerly 130559fc1d4fb0be58387838e519191858bc2120 [formerly d262dc63f0]]
Former-commit-id: fa578f48226237d69efec1581a00bc9a6b2069a3 [formerly 83304c3e4c]
Former-commit-id: 3df65a2ad9
2013-05-10 09:58:02 -05:00
Dustin Johnson
ea752736f3 Merge "Issue #1967 undo mistake" into development
Former-commit-id: 54523a03ee [formerly 403ae0d458] [formerly e82d454167] [formerly 54523a03ee [formerly 403ae0d458] [formerly e82d454167] [formerly 519d46724a [formerly e82d454167 [formerly f0529c591755d871796a6d5acae43c443c8c301c]]]]
Former-commit-id: 519d46724a
Former-commit-id: 7452c3b960 [formerly 6ffe9cd833] [formerly c5635770089f58abb29f991ae55d67d79bd89a90 [formerly b3be6bb88b]]
Former-commit-id: ba4e497d5447c577b09ff60bc5c95b8e9d6fdb2a [formerly da159a9c31]
Former-commit-id: dc30897353
2013-05-10 09:25:58 -05:00
Nate Jensen
54a4447f63 Issue #1967 undo mistake
Change-Id: Ib74893b356edf16b045e1f8f5165bef59388422b

Former-commit-id: 5fffb10b86 [formerly f149e3f645] [formerly 250548dc66] [formerly 5fffb10b86 [formerly f149e3f645] [formerly 250548dc66] [formerly 47e402afc9 [formerly 250548dc66 [formerly 2cd8c512ca8cbf0b7070587f659e9bc12f53e580]]]]
Former-commit-id: 47e402afc9
Former-commit-id: a37054e071 [formerly af2fded870] [formerly dda418c83d076d0fbe15b2943c468e91f6f132a3 [formerly f8cd2effdf]]
Former-commit-id: 1ce00fb886fdd9a2e1d9bf1d9cf07ca2557e7fe4 [formerly f3989b7187]
Former-commit-id: d4789e5e87
2013-05-10 09:20:17 -05:00
Bryan Kowal
89b90b78b2 Issue #1995 - Wes2Bridge jar construction is now compatible with Eclipse 3.8.
Former-commit-id: 4e902e0a03 [formerly 6b7afdbb53] [formerly e7bc2fecc6] [formerly 4e902e0a03 [formerly 6b7afdbb53] [formerly e7bc2fecc6] [formerly c80ba9633e [formerly e7bc2fecc6 [formerly 70d82ca1c40d02b1918d539d57b342f59d67e12b]]]]
Former-commit-id: c80ba9633e
Former-commit-id: 4ca2eded54 [formerly 0292eb3b03] [formerly ec9c1249e88bc06c300e8cba09fe8b7a87a3502c [formerly 7cd6653d71]]
Former-commit-id: 0d83685a466bbfa61541c9b4486f9b0980ff4cb4 [formerly 7896fa119b]
Former-commit-id: 067fabb8eb
2013-05-09 19:51:32 -05:00
Bryan Kowal
424fd3b9a4 Issue #1927 - the rpm build will now correctly use the configurable uframe-eclipse location
Change-Id: I2e74909da3f08bf7ef355470786d018df248cb58

Former-commit-id: 47ae8f74c2 [formerly 3ad9637805] [formerly 5844657522] [formerly 47ae8f74c2 [formerly 3ad9637805] [formerly 5844657522] [formerly baa6b26c34 [formerly 5844657522 [formerly e9a9ed516bb3f1c9c2b4a768de07c46048de4077]]]]
Former-commit-id: baa6b26c34
Former-commit-id: f3411d8e51 [formerly 69622150f8] [formerly 9b3f874c72ba86caf08b5f6a50eb61fcaf3a2a06 [formerly eafa210750]]
Former-commit-id: 7ef388c8bfc8fbb41c5ecfdea44267bf46a9b4dc [formerly a73af7bdc0]
Former-commit-id: 8850ac004b
2013-05-09 16:46:04 -05:00
David Gillingham
a907e694b3 Issue #1898: Ensure map bundles are copied to /site/bundles/maps/ not /site/maps/.
Change-Id: Iccd50915b7b19c49fe35fdfc7edd678e9fd7dac4

Former-commit-id: cb4a08c462 [formerly 11cb7b2295] [formerly 51063c7c53] [formerly cb4a08c462 [formerly 11cb7b2295] [formerly 51063c7c53] [formerly 36944298f4 [formerly 51063c7c53 [formerly 4c7f1216d9e2ba683bc46adcfe1d5863e4477490]]]]
Former-commit-id: 36944298f4
Former-commit-id: f5c173cd59 [formerly c5983413a0] [formerly b588bb9f2302f7ea860ccec675a0926c0b479454 [formerly d475d8f07b]]
Former-commit-id: fc7cc38a9f948d470d1c3307c5a4bb760429465b [formerly 65e64221d5]
Former-commit-id: 50d58b588e
2013-05-09 14:28:17 -05:00
Richard Peter
eb68efb895 Merge "Issue #1869 Remove dataURI column from PluginDataObject. Change-Id: I3450130d8e68c065683794ba941a83897fe36745" into development
Former-commit-id: 4ccc1fe35f [formerly 614b7633f9] [formerly ef69a8dbca] [formerly 4ccc1fe35f [formerly 614b7633f9] [formerly ef69a8dbca] [formerly b361674d5c [formerly ef69a8dbca [formerly 798845cfdf3356f5badae8cdd1cceb84094651c5]]]]
Former-commit-id: b361674d5c
Former-commit-id: 9b4a7b7225 [formerly 03d18c9482] [formerly 905463abd86305efe5c16fd5f21792e2fa29d42f [formerly 7ca31bd7ce]]
Former-commit-id: d02a57929d4bb2dafe7494478741f3609bfcabe2 [formerly e1b58893c2]
Former-commit-id: 618f813b9d
2013-05-09 09:25:24 -05:00
Greg Armendariz
fb9614d07e Merge "Issue #1952 - first modification; removed libraries and updated set_hydro_env" into development
Former-commit-id: 7c9207ddfe [formerly 465561f82c] [formerly 1ce683a4d5] [formerly 7c9207ddfe [formerly 465561f82c] [formerly 1ce683a4d5] [formerly 19ead4eabe [formerly 1ce683a4d5 [formerly 5f7feb732c50c76075d682cc2c88be9a9eedfd3e]]]]
Former-commit-id: 19ead4eabe
Former-commit-id: d6c24efe13 [formerly e21b6476f4] [formerly ec2744d7b2a5f77e681f9846bea0020115f8dd75 [formerly 09c6ccd54e]]
Former-commit-id: 40cad6d85ce116ee125456b4f6e8120918f80bc4 [formerly bb2272a1b3]
Former-commit-id: 2c2273fb82
2013-05-09 08:59:32 -05:00
Brad Gonzales
552447e293 Issue #1970 added annotation comment to PluginDataObject header.
Change-Id: Ic6612278d98f862e0d1ba3d504a0391cf59f6a52

Former-commit-id: 1268c61a9d [formerly 36345cc166] [formerly 90d93e2a02] [formerly 1268c61a9d [formerly 36345cc166] [formerly 90d93e2a02] [formerly ed59927d62 [formerly 90d93e2a02 [formerly a84978566dda2f943dff31f61c30ee286d961fd1]]]]
Former-commit-id: ed59927d62
Former-commit-id: d95850398b [formerly 41fbf12b4d] [formerly e6289ff252c33afbb2dc87e5b8870b9c07b0db1e [formerly 877fbacffe]]
Former-commit-id: b89f9ead8df13054e8ee03d68f1d6783f1c7ed9f [formerly 7938eea395]
Former-commit-id: 6421017e65
2013-05-09 08:05:49 -05:00
Bryan Kowal
152426b0b8 Issue #1927 - handle the case where the python illusion does not exist.
Change-Id: I227b8fcb8a80e9e712c2b1b8a116324a604219b3

Former-commit-id: a2adff5984 [formerly 4a1c34e0f4] [formerly 96f24ae69e] [formerly a2adff5984 [formerly 4a1c34e0f4] [formerly 96f24ae69e] [formerly 7273b97aa4 [formerly 96f24ae69e [formerly 3af95f9f0a3449cbad2183a1ccda93c989c1e006]]]]
Former-commit-id: 7273b97aa4
Former-commit-id: 134c9ee105 [formerly 854081e77b] [formerly c7a112f14274903b83b7bb0ecce98e10c606be8b [formerly 8b35bf6bda]]
Former-commit-id: 7123a37e1bcb9a029a0e322ae9519a4f46859151 [formerly f545c14592]
Former-commit-id: 80f396bbd3
2013-05-08 21:27:43 -05:00
Nate Jensen
42802789da Merge "Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication." into development
Former-commit-id: ef16da1c62 [formerly 6dae59d1ac] [formerly 19f0ca1fb0] [formerly ef16da1c62 [formerly 6dae59d1ac] [formerly 19f0ca1fb0] [formerly d2a108ed8a [formerly 19f0ca1fb0 [formerly 3ba0adb830cc0839d39a8cd938fbde3cf27e4651]]]]
Former-commit-id: d2a108ed8a
Former-commit-id: 353c62d44a [formerly fce991dac7] [formerly 7fc605abba0b3c2d0f35f1ec7b54181967ee3fb9 [formerly a5bedd2a27]]
Former-commit-id: ff8c7d37e06bfe5b64935e0f09c4dff24da514c0 [formerly 825c46815a]
Former-commit-id: 5070778f06
2013-05-08 18:42:28 -05:00
Nate Jensen
c8bf965fcb Merge "Issue #1978 Perform variable substitution on subMenu IDs." into development
Former-commit-id: 928953493d [formerly 11965c031f] [formerly 9e0f3acbc0] [formerly 928953493d [formerly 11965c031f] [formerly 9e0f3acbc0] [formerly e753329f47 [formerly 9e0f3acbc0 [formerly b1e425c0da9a241a60f2a0508c40d180fe5058fa]]]]
Former-commit-id: e753329f47
Former-commit-id: 148a005bfd [formerly 84caf44a0c] [formerly 017678ac36dc45fdfad60b080392f0b3fef458b8 [formerly 2299e22de2]]
Former-commit-id: 311687a508ff66fdc89ed0830479c0799bee667f [formerly 747163abc1]
Former-commit-id: b638a10153
2013-05-08 18:40:51 -05:00
Ben Steffensmeier
2b26557020 Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745

Former-commit-id: 7c91a83521 [formerly dab2af2df5] [formerly 4209e014d8] [formerly 7c91a83521 [formerly dab2af2df5] [formerly 4209e014d8] [formerly 79015595ee [formerly 4209e014d8 [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]]]
Former-commit-id: 79015595ee
Former-commit-id: 4f488940de [formerly 9cf071338e] [formerly d2f613e06b0e271020b7c52b497bdf43641096be [formerly 1c51f0b5f2]]
Former-commit-id: 6ad58b90d9f06f52b93c2fbae3d6c2833346af16 [formerly 7e721fb860]
Former-commit-id: d9da19b7d2
2013-05-08 18:39:25 -05:00
Max Schenkelberg
46c630d325 Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication.
Amend: Deleted old DecisionTree

Change-Id: Id51a32c42f5485a5261dd73f88f55a6fda3263c8

Former-commit-id: 76d2e27f3f [formerly 14dba9a749] [formerly ea2501abbb] [formerly 76d2e27f3f [formerly 14dba9a749] [formerly ea2501abbb] [formerly 40c76c2c82 [formerly ea2501abbb [formerly 4f76cfa7102f2b266bc94dbeb4ed6d2e4028c106]]]]
Former-commit-id: 40c76c2c82
Former-commit-id: 6a7461bfb5 [formerly 48a283f0f2] [formerly 99c9ac745d21ab21d542ae5c708afb7d811bd08d [formerly fc27ac4a30]]
Former-commit-id: 57ae24aafa8a42a2a4f1f8d3ad55d253af3a6af7 [formerly 1d3e653520]
Former-commit-id: 4a9f001831
2013-05-08 17:58:19 -05:00
Richard Peter
2649d1d442 Issue #1814: Remove slow consumer disconnect. Add time to live to all topics
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7

Former-commit-id: c2dcbedf63 [formerly ae84ced7be] [formerly 4f3e86574b] [formerly c2dcbedf63 [formerly ae84ced7be] [formerly 4f3e86574b] [formerly 697297803c [formerly 4f3e86574b [formerly c46f5e242493d67f2bb89b2bbba7dcaf9b0f81f4]]]]
Former-commit-id: 697297803c
Former-commit-id: 8917cc0b8d [formerly 139c234452] [formerly c40599aa14bfde53120b5b8c8af969cd6cc57c9e [formerly cfaeeaff5f]]
Former-commit-id: f2f7acf2e73af54b0346602508ceed49c091f885 [formerly dfba22e206]
Former-commit-id: a2cfd38f6a
2013-05-08 17:28:01 -05:00
Ron Anderson
f9835c0445 Merge changes Id2d7981b,I094b88ed into omaha_13.4.1
* changes:
  Issue #1939: Update AlertVizApplication to start NotificationManagerJob
  Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories


Former-commit-id: 2afb5d56d5 [formerly 0bb6152a7b] [formerly 8a297d8e53] [formerly 2afb5d56d5 [formerly 0bb6152a7b] [formerly 8a297d8e53] [formerly 65923ed892 [formerly 8a297d8e53 [formerly 1e94530814e28cc2a34cc92eab7164da3c3383e6]]]]
Former-commit-id: 65923ed892
Former-commit-id: 158dc49c6d [formerly 697c149281] [formerly 2d2f67cad9cc5373df9e82190f0bb5b4ec1bf4c4 [formerly 532c740ce4]]
Former-commit-id: e39946572937293f5a3ded29f96c82a4bab3612d [formerly a331ec539f]
Former-commit-id: 78d3efbbac
2013-05-08 15:08:40 -05:00
Richard Peter
8cd64fbe06 Issue #1939: Update AlertVizApplication to start NotificationManagerJob
Change-Id: Id2d7981bf84befb771480126b4f250e80ee005a2

Former-commit-id: 289f73d1a4 [formerly 615a1182ea] [formerly f1f8260893] [formerly 289f73d1a4 [formerly 615a1182ea] [formerly f1f8260893] [formerly 785b402364 [formerly f1f8260893 [formerly 9f4d4de342b45ea54e328eec47fc606f1b087473]]]]
Former-commit-id: 785b402364
Former-commit-id: 856824e025 [formerly 394018accf] [formerly c983d21a7d9365c0fb026918dc96f3e1f5d0face [formerly 4e878364c3]]
Former-commit-id: cf8a0853cceb9f42683747009e5da350fb6cbbf0 [formerly 92c4c493b8]
Former-commit-id: a731dea1c1
2013-05-08 14:55:43 -05:00
Bryan Kowal
6333750eac Issue #1982 - prefix the qpid-java rpms with awips2.
Former-commit-id: a6d15fcb3c [formerly a55331f29f] [formerly bc39afbd24] [formerly a6d15fcb3c [formerly a55331f29f] [formerly bc39afbd24] [formerly 4513b65ad6 [formerly bc39afbd24 [formerly 89d10d50e5135e8b9f52a94ca1f4df53db7e4cf9]]]]
Former-commit-id: 4513b65ad6
Former-commit-id: 3a2154b47a [formerly ecac3f4403] [formerly 03bfba28c50e2f18676d3107bbdc7bf11245386b [formerly 0c511e1d87]]
Former-commit-id: 6b23bce3fc1b598c28efdeab2b61a175b27f80ca [formerly 95aa897f3e]
Former-commit-id: 145b97a88b
2013-05-08 14:53:29 -05:00
Ben Steffensmeier
39cd230c39 Issue #1978 Perform variable substitution on subMenu IDs.
Former-commit-id: a631b73aa9 [formerly ff182c21e1] [formerly aec7e4200c] [formerly a631b73aa9 [formerly ff182c21e1] [formerly aec7e4200c] [formerly ef3086cf39 [formerly aec7e4200c [formerly d6ae38dcdde7984d5caebcb27c80780123599854]]]]
Former-commit-id: ef3086cf39
Former-commit-id: fcfbf66d4c [formerly 13913892fa] [formerly 3a0e0a1c2c019d24b4fcd63f0eaef8088eff245a [formerly dd72b5cab1]]
Former-commit-id: 646dc45bb62c5f0e4508277722ff40770ceccfa0 [formerly 9b79e5e6cc]
Former-commit-id: 0e0882b8fa
2013-05-08 14:43:59 -05:00
Ben Steffensmeier
4a700cc22f Issue #1980 Set paint status in GridResources for KML.
Former-commit-id: c28d23be1c [formerly 56c8d14a34] [formerly 3d0e8a6e2d] [formerly c28d23be1c [formerly 56c8d14a34] [formerly 3d0e8a6e2d] [formerly 28cdc018a5 [formerly 3d0e8a6e2d [formerly a0dc21599e1056a39ac28bac7269f605e50082fb]]]]
Former-commit-id: 28cdc018a5
Former-commit-id: 3d21898235 [formerly ced7f55d63] [formerly 758e305fd578f36a24e55e64707431c8d3525365 [formerly 37a96c2f4f]]
Former-commit-id: 9376f2e1517fc9d21cc0928837dd86b08e5d852d [formerly fcda1fcb5e]
Former-commit-id: 7c8c42a70e
2013-05-08 14:00:15 -05:00
Richard Peter
feb3a74949 Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories
Change-Id: I094b88ed190287881c5f0e340c801571c2e38651

Former-commit-id: 94b56278e5 [formerly 96e2f1766c] [formerly ff60ca76f7] [formerly 94b56278e5 [formerly 96e2f1766c] [formerly ff60ca76f7] [formerly f59e4c9de9 [formerly ff60ca76f7 [formerly 0168cccd15ddb07988d946e3f4d719035dc63fb5]]]]
Former-commit-id: f59e4c9de9
Former-commit-id: 2de8bd116d [formerly 1174ffe848] [formerly c61158a43637c1f37b2c2b4fd8ccad972e074ffe [formerly 30fc52f742]]
Former-commit-id: f3e0e032d6a4e3348ce25d68e207ff233b7dfec9 [formerly 3129e77a4d]
Former-commit-id: 91b98e2a00
2013-05-08 13:49:29 -05:00
Bryan Kowal
3e45f15b1f Issue #1952 - first modification; removed libraries and updated set_hydro_env
- libgofrtran is required by numpy so it will be installed at the standard location
- libjapser is provided by python
- libjvm is provided by the java; attempting to use the current version of libjvm


Former-commit-id: 94a0b742be [formerly 30d6d39db1] [formerly de588e9749] [formerly 94a0b742be [formerly 30d6d39db1] [formerly de588e9749] [formerly b40f36b341 [formerly de588e9749 [formerly 2afcf9e6e48da20ccf9cffd8cdcf4ba2fd7aff1d]]]]
Former-commit-id: b40f36b341
Former-commit-id: b9edb6a668 [formerly e6155a73af] [formerly 02570166ee138744d2ce14b0e646da7f7a8f937d [formerly fc67858e0f]]
Former-commit-id: e55d3ab6b4aedfca356b0afa883fd5cd57accb67 [formerly 07d2000a41]
Former-commit-id: 16987f7641
2013-05-08 13:41:08 -05:00
Nate Jensen
caebf87da0 Merge "Issue #1986 optimized table sorting" into omaha_13.4.1
Former-commit-id: 10025c2174 [formerly 2ab4ae9d16] [formerly 48d0829957] [formerly 10025c2174 [formerly 2ab4ae9d16] [formerly 48d0829957] [formerly edcd6c851c [formerly 48d0829957 [formerly ed7005a317c7d5bca71370544d6f2f79e10e9dee]]]]
Former-commit-id: edcd6c851c
Former-commit-id: 879e4b54be [formerly 435ebdd199] [formerly c52eeb452de35110225827936c20673e78826505 [formerly c52c101f14]]
Former-commit-id: c895dc9b518b7d7954c4ad67bcc08324c1372151 [formerly 64fc831eb0]
Former-commit-id: 654ecedcb4
2013-05-08 13:09:59 -05:00
Nate Jensen
b1309f5d36 Issue #1986 optimized table sorting
Change-Id: I699b5c99960fd28a327e8c2f7301fac3183894b0

Former-commit-id: e40d94e3b1 [formerly 7eb8725c69] [formerly bc1d029bd4] [formerly e40d94e3b1 [formerly 7eb8725c69] [formerly bc1d029bd4] [formerly 8ad319d0f6 [formerly bc1d029bd4 [formerly 2b9f07f2b7eaf500d554424daa0e2740384164f1]]]]
Former-commit-id: 8ad319d0f6
Former-commit-id: c75b56f2b7 [formerly 03d798817d] [formerly 285de642f16eea6b4024d7669a6a65b9e5969b37 [formerly 1700be8b03]]
Former-commit-id: 21dd458065d32edff33bf91580e0ce52979b7cfc [formerly ac747f4e02]
Former-commit-id: 6c69f1b82f
2013-05-08 13:09:17 -05:00
Nate Jensen
57a3a20335 Merge "Issue #1954 Revert HucLevelGeometriesFactory" into omaha_13.4.1
Former-commit-id: 4ba59ef95e [formerly 13201bdc1c] [formerly cdf07833b9] [formerly 4ba59ef95e [formerly 13201bdc1c] [formerly cdf07833b9] [formerly 02464ba2d5 [formerly cdf07833b9 [formerly 7bf591249ed0495be49813e77c6c5111c0c9b0b4]]]]
Former-commit-id: 02464ba2d5
Former-commit-id: cc894cb894 [formerly caf05c1517] [formerly 08f0e00c2c54baf07503d6cfe7712d237ebdea67 [formerly 39c92d85ee]]
Former-commit-id: 8951b9e9a4490cf027ee07a37eeeb209d4fd315c [formerly d92c828191]
Former-commit-id: b900ff6d1e
2013-05-08 13:03:50 -05:00
Nate Jensen
4bb132ba81 Merge "Issue #1847 Allow painting with no Wind Data. Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c" into omaha_13.4.1
Former-commit-id: 25c86dea79 [formerly ff7cf78d17] [formerly 653f4b2a0d] [formerly 25c86dea79 [formerly ff7cf78d17] [formerly 653f4b2a0d] [formerly 744aaa14d6 [formerly 653f4b2a0d [formerly 129d546951798a7c839b420eb847baf1cebff2e2]]]]
Former-commit-id: 744aaa14d6
Former-commit-id: b44f864384 [formerly 078efc3112] [formerly 1fe3c867f713d718ffaf26f0ef56b8ce320661b4 [formerly 94f950734b]]
Former-commit-id: e21f53dcee421e07f74982af5b8266d038c37efe [formerly 93e084e485]
Former-commit-id: 80d5f13244
2013-05-08 13:02:59 -05:00
Ben Steffensmeier
9b6f00c63e Issue #1847 Allow painting with no Wind Data.
Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c

Former-commit-id: c653b26b26 [formerly dcf4c3cb6e] [formerly 52845da6a8] [formerly c653b26b26 [formerly dcf4c3cb6e] [formerly 52845da6a8] [formerly 7b96ccbf0e [formerly 52845da6a8 [formerly c4eec589218d1c1265fd596646abd9dc2322fd74]]]]
Former-commit-id: 7b96ccbf0e
Former-commit-id: b871b71dfa [formerly 5f1fcac916] [formerly 546c5fb066a2d3d0a153a33b16e7c62eb38a297e [formerly 5b151d48e2]]
Former-commit-id: 0672fc8c149572e9252e6fcd82f1aa8d586af898 [formerly 0a36658729]
Former-commit-id: c0d3bd1140
2013-05-08 12:34:46 -05:00
Ron Anderson
2b2eb2a4a9 Merge "Issue #1988: Fix iscMosaic regression caused by DR 1941." into omaha_13.4.1
Former-commit-id: 345ac8a298 [formerly dd303701a1] [formerly 4e63cd7a70] [formerly 345ac8a298 [formerly dd303701a1] [formerly 4e63cd7a70] [formerly 4b91905eaf [formerly 4e63cd7a70 [formerly 790a0c78c95414ddec13294b68905b1d7bbb60a9]]]]
Former-commit-id: 4b91905eaf
Former-commit-id: 086d8fc246 [formerly 995acbba33] [formerly ffafc2c173e962c618788f71949437d7c0a3a6dd [formerly 62c271f932]]
Former-commit-id: a5cc4b645f30b6b7b90f0ddf2147355921df7d2c [formerly 67864c9b3c]
Former-commit-id: d017dcbebf
2013-05-08 12:21:28 -05:00
Ben Steffensmeier
e74018d1ba Issue #1954 Revert HucLevelGeometriesFactory
Former-commit-id: 85326d4eb5 [formerly b323f1f266] [formerly dbb6e1abbf] [formerly 85326d4eb5 [formerly b323f1f266] [formerly dbb6e1abbf] [formerly 6f0fadbfbf [formerly dbb6e1abbf [formerly 0be6bba1ac6db873c54f72bdb7e267bd6cc2ce5a]]]]
Former-commit-id: 6f0fadbfbf
Former-commit-id: aa20be04ce [formerly 58668d66cb] [formerly fa60784dabe08ae6cbe0ad79f9d2d30533bf806d [formerly 87775a876d]]
Former-commit-id: cf9b988103fc44e6fa3a8eb22c9628729a4bae10 [formerly 10497833f4]
Former-commit-id: b9251e1933
2013-05-08 12:14:29 -05:00
Richard Peter
a4ed041eb9 Merge "Issue #1970 added check for Abstract Entity sql TABLE declarations in SchemaManager." into omaha_13.4.1
Former-commit-id: d2a407fe49 [formerly 05298c29be] [formerly 9b9c19c96f] [formerly d2a407fe49 [formerly 05298c29be] [formerly 9b9c19c96f] [formerly 68a83a56e0 [formerly 9b9c19c96f [formerly 54afaa408fc663ed1d88883c843ce92ee41ac0cd]]]]
Former-commit-id: 68a83a56e0
Former-commit-id: 6fc9283ead [formerly ccd08b2f59] [formerly d9ef466247d4f97b763014797d95bf27dce90c21 [formerly a10753ebe7]]
Former-commit-id: 1a2b7abfa8d1cd69372ff7198e0d6eabac41ae22 [formerly bbfabbc442]
Former-commit-id: f983ef909b
2013-05-08 11:28:58 -05:00
David Gillingham
f98585c821 Issue #1988: Fix iscMosaic regression caused by DR 1941.
Change-Id: I6b2f28c6c1519645d3eedb081288e35545612ca9

Former-commit-id: 38b8a03b40 [formerly fb5996c663] [formerly 110c7d2571] [formerly 38b8a03b40 [formerly fb5996c663] [formerly 110c7d2571] [formerly 8140f0f00f [formerly 110c7d2571 [formerly d0ef15027759d301e16a4897b8ddc4a6670de2fb]]]]
Former-commit-id: 8140f0f00f
Former-commit-id: d913c3ae5f [formerly ea79ddc331] [formerly b933b5dddd80ffc8560b2d0fb385708af784ef49 [formerly 2dee8ddb16]]
Former-commit-id: cedb17efc89711e2f9cce2d4907b28463793c460 [formerly 696a6318f0]
Former-commit-id: f95203ecdc
2013-05-08 11:14:23 -05:00
Nate Jensen
2a4d754202 Issue #1967 fix for 64 bit edex
Change-Id: I28acbfa8dea794629968f50b83d82530fcb04e19

Former-commit-id: 20a4a40167 [formerly 8a044f6dea] [formerly d29aeb14ff] [formerly 20a4a40167 [formerly 8a044f6dea] [formerly d29aeb14ff] [formerly c92acc0ef1 [formerly d29aeb14ff [formerly 1c6b8e2c50b96a78709ea0aa7925f8244cd604c8]]]]
Former-commit-id: c92acc0ef1
Former-commit-id: 5651f9dbda [formerly 9de17c698a] [formerly 1ca9a7cd0a49cfcbbb16d973ea524c0e91c9de26 [formerly 0f2e6ccddf]]
Former-commit-id: 8b84fa807e9b1c5064b3faecbeb296e305286358 [formerly 5fa3ae62bb]
Former-commit-id: 597b9cf4fa
2013-05-08 10:01:04 -05:00
Bryan Kowal
3e659cc324 Issue #1967 - update ant build scripts for Eclipse 3.8 compatibility
Former-commit-id: 6d27adc1e0 [formerly 776757e8ba] [formerly 115a102f22] [formerly 6d27adc1e0 [formerly 776757e8ba] [formerly 115a102f22] [formerly eec15f77ae [formerly 115a102f22 [formerly b9b1cb41e5e55b3cd2534cd899d0b3fe4af01a96]]]]
Former-commit-id: eec15f77ae
Former-commit-id: c5b5163f24 [formerly f9f79ccf65] [formerly 72216d3cc12a80bd62834346b528c8ee883e55af [formerly 88c3cf3b48]]
Former-commit-id: 78bee7eada59989ed80a0b90ebeea56c4bb5f338 [formerly c266fb1ef5]
Former-commit-id: fe4d54960e
2013-05-07 17:54:30 -05:00
Nate Jensen
4409a4f0e8 Issue #1967 eclipse 3.8 compatibility
Change-Id: I37a42670b1fe9634b1de4b751f284971b545ac7b

Former-commit-id: f2a0212fda [formerly 8c55960a53] [formerly a1dbc9cd33] [formerly f2a0212fda [formerly 8c55960a53] [formerly a1dbc9cd33] [formerly b35365b8a8 [formerly a1dbc9cd33 [formerly 6c709fa5aa71daf4af3f4a9c7f2a56e19e0b06c7]]]]
Former-commit-id: b35365b8a8
Former-commit-id: ce33f53b80 [formerly 7f2f96f47d] [formerly b1f86707e4f67bb298f201b107a51abf03bc05a2 [formerly ff4565ca16]]
Former-commit-id: 40a11fc49e5ed404c9a59f1e07afc1e879106acd [formerly 12c7dc578e]
Former-commit-id: 501aa91924
2013-05-07 15:55:48 -05:00
Mike Duff
ca4329a312 Issue #1976 - Fix race condition in Hydro TS
Peer Review comments

Change-Id: I124176dcc242709f30f19152e7ecb6fda4e7c861

Former-commit-id: 9227336413 [formerly 62254c56ac] [formerly c27de86f3d] [formerly 9227336413 [formerly 62254c56ac] [formerly c27de86f3d] [formerly 00d96e88ac [formerly c27de86f3d [formerly 80c08a73c2bcaf853e63c175334b9f00dd93d696]]]]
Former-commit-id: 00d96e88ac
Former-commit-id: 9381a96b69 [formerly 9959645255] [formerly 77ca32375486746930a9155481ba12efa3a3637c [formerly ae1e879aa4]]
Former-commit-id: 2445ca01958a236a139e6a9474cac2cdf6b36cd5 [formerly 12722ddbcd]
Former-commit-id: 62f8c7e9aa
2013-05-07 13:17:33 -05:00
David Gillingham
2c625de614 Issue #1762: Remove NATIONAL_CENTER setting from svcbu.properties,
all code that used that setting will now use new
CheckServiceBackupPrimarySiteRequest.

Change-Id: I0f9ebe68ba73a6aaf1882ae361327d7681449e31

Former-commit-id: 2dedd9efec [formerly dd7f9d9d0c] [formerly 0259bb6672] [formerly 2dedd9efec [formerly dd7f9d9d0c] [formerly 0259bb6672] [formerly 75a499f802 [formerly 0259bb6672 [formerly 1b2c23abda7ed0a296bf1ffb1f3e8e27dc02555e]]]]
Former-commit-id: 75a499f802
Former-commit-id: ca6583f94c [formerly 99f3eb9f55] [formerly 7cd8ea80d80e0e218f7092215d1d3ed3594a4914 [formerly f01a35c671]]
Former-commit-id: 2953b1a3216bdc4cf3441e2a304839310a8d52ef [formerly 1e767fa5d1]
Former-commit-id: 83edf1e2db
2013-05-07 10:48:39 -05:00