Commit graph

2886 commits

Author SHA1 Message Date
Richard Peter
44b7de35fc Merge "Issue #1989 removing unused jars" into development
Former-commit-id: 303267be4d [formerly 303267be4d [formerly 544b8830ec6c95ff88726b1095662fac5438cfcb]]
Former-commit-id: ad43b7bab5
Former-commit-id: fb1197ecb7
2013-05-15 16:17:57 -05:00
Bryan Kowal
e39c66a454 Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment
Former-commit-id: 5811585229 [formerly 5811585229 [formerly 3bbc0996f4e5e6ab9d11a7481aff39d6a9ee0044]]
Former-commit-id: 41f4075e6f
Former-commit-id: aabc22cc2e
2013-05-15 15:37:16 -05:00
Ben Steffensmeier
6333ed4841 Issue #1869 Remove DataURI column from ldadmesonet.
Former-commit-id: 080b43444a [formerly 080b43444a [formerly 6bf797d6e0b3334f15c1ac68c9433b9e3ec39c79]]
Former-commit-id: bbe2667522
Former-commit-id: f813b40379
2013-05-15 15:35:02 -05:00
Nate Jensen
2b72b5c530 Issue #1989 removing unused jars
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301

Former-commit-id: 9c2b6bad3e [formerly 9c2b6bad3e [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]]
Former-commit-id: f4b8c0dc60
Former-commit-id: 0234e6788b
2013-05-15 14:44:30 -05:00
Richard Peter
89fc805bfe Merge "Issue #1869 Remove DataURI from goes/poes soundings. Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416" into development
Former-commit-id: 286ec23fab [formerly 286ec23fab [formerly 3b822a67f95e98b4b56d66fde64d9065f0b29a11]]
Former-commit-id: bcbe24f489
Former-commit-id: ce6452daac
2013-05-15 14:41:04 -05:00
Nate Jensen
f7d304c51b Merge "Issue #2007 unpack plugins that have res/spring files" into omaha_13.4.1
Former-commit-id: 35830d317d [formerly 35830d317d [formerly 444b61ff0af4a687bdf7daab51a3b435f91f3829]]
Former-commit-id: 7f9ef5ce98
Former-commit-id: 4c7b2d73d3
2013-05-15 14:00:15 -05:00
David Gillingham
fab4021ce4 Issue #1842: Use GetNextEtnRequest to handle ETN assignment for GFE VTEC
products.

Change-Id: Ice767da91252461fabf3fe8b5296e3d1e90a9c1d

Former-commit-id: 9c688f7070 [formerly 9c688f7070 [formerly 13d5d8dd7c59fcf399d62e83c9eb7021bca4c2d1]]
Former-commit-id: 84158e76c7
Former-commit-id: ca10ac1598
2013-05-15 13:56:53 -05:00
Nate Jensen
43369f0cf3 Issue #2007 unpack plugins that have res/spring files
Change-Id: Ibc8720a873ae8ba11e89d5d88c668418a3abfc9b

Former-commit-id: 948e47a2c6 [formerly 948e47a2c6 [formerly 147787a0a161bd54926e9ec86aee472b414859ed]]
Former-commit-id: fecadf104b
Former-commit-id: ba3bda461c
2013-05-15 13:36:09 -05:00
Bryan Kowal
a2a6d0bdad Issue #2002 - do not include .gitignore files in the rpm
Former-commit-id: 60ae5df378 [formerly 60ae5df378 [formerly 33160e9835e8e153d60b76619b75e22bd3f75fc8]]
Former-commit-id: 107055781d
Former-commit-id: 7df8e11ed3
2013-05-15 13:31:24 -05:00
Nate Jensen
0a49169575 Merge "Issue #1927 - add quartz as a RadarServer build dependency" into development
Former-commit-id: 591eb2d6e2 [formerly 591eb2d6e2 [formerly 5db35fcaef26b2817bfcd4a051f4c1f05d8fdcdd]]
Former-commit-id: b621d417e5
Former-commit-id: b9275b3c2b
2013-05-15 13:02:58 -05:00
Ben Steffensmeier
ff9ce2b7c4 Issue #1869 Remove DataURI from goes/poes soundings.
Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416

Former-commit-id: b905ee013c [formerly b905ee013c [formerly 836239896aace50e37896f6219015a75aea117b7]]
Former-commit-id: 1c3e60a5ff
Former-commit-id: 8ea143a147
2013-05-15 12:50:08 -05:00
Richard Peter
69ce5d7529 Merge "Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen." into development
Former-commit-id: 0523d790f8 [formerly 0523d790f8 [formerly 3abbb84fdb4b2a9e52757d4b5f2e8cb9fb94899e]]
Former-commit-id: 82ccd32ee0
Former-commit-id: b40e0ca1c9
2013-05-15 12:44:48 -05:00
Richard Peter
3e60ceec03 Merge "Issue #1869 Revert changes to bufrmos types used by ncep." into development
Former-commit-id: f1d65e7028 [formerly f1d65e7028 [formerly ce880367eb70abdd85664841e3775142f6e28c50]]
Former-commit-id: 48b67522d5
Former-commit-id: aa3ef28527
2013-05-15 12:44:28 -05:00
Bryan Kowal
7692701168 Issue #1927 - add quartz as a RadarServer build dependency
Change-Id: I1bc64bc347ebd54e249dbd8e4b2cadfa65c28b56

Former-commit-id: 047a3de7bd [formerly 047a3de7bd [formerly f3dc0db70d9c3c680b56c07f18c84e2fbc2daaa2]]
Former-commit-id: 99a5290083
Former-commit-id: 63fa948ba8
2013-05-15 12:38:02 -05:00
Bryan Kowal
59024f8dd7 Issue #1982 - awips2-qpid-java rpms will no longer be dependent on qpid-java rpms
Former-commit-id: f9e77e90b7 [formerly f9e77e90b7 [formerly 1f656fbe0a267ace1dad3b22b3ef7ef1bd7c8d92]]
Former-commit-id: 0e3e3e891b
Former-commit-id: 0af34bbe4c
2013-05-15 11:55:56 -05:00
Ben Steffensmeier
7ce819184a Issue #1869 Revert changes to bufrmos types used by ncep.
Former-commit-id: 62b85f3afe [formerly 62b85f3afe [formerly 71808a9d82233a395c5e5a394b0708b07405f553]]
Former-commit-id: dd320f2a56
Former-commit-id: 27b0b4a289
2013-05-15 11:45:51 -05:00
Dustin Johnson
8276c2a9c9 Merge "Issue #2000 Fix reinitializing of bandwidth manager" into development
Former-commit-id: 8a70a773d5 [formerly 8a70a773d5 [formerly f300554c735266999f57e0331eda63420e5a6ef3]]
Former-commit-id: c88be3579c
Former-commit-id: 8c26413d23
2013-05-15 10:50:53 -05:00
Dustin Johnson
c2c849fe7e Issue #2000 Fix reinitializing of bandwidth manager
Change-Id: I8af056eea7d40a13e9189afa81414f7088690267

Former-commit-id: e38e8d7dc5 [formerly e38e8d7dc5 [formerly 1073806e6f0a84da0538160d83ee3c12b92d84d5]]
Former-commit-id: e374011c49
Former-commit-id: 98d99250b2
2013-05-15 10:24:33 -05:00
Richard Peter
6cc24d855f Merge "Issue #1869 Remove DataURI column from bufrmos. Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e" into development
Former-commit-id: f1920eb8d9 [formerly f1920eb8d9 [formerly 5c73f61cf2401ccc901771f92147bfb4bc6d9c25]]
Former-commit-id: 47124d2411
Former-commit-id: f4974ebd19
2013-05-15 10:00:19 -05:00
Ben Steffensmeier
5dc7de691b Issue #1869 Remove DataURI column from bufrmos.
Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e

Former-commit-id: 026a824e60 [formerly 026a824e60 [formerly 5b740e5d614d9cac2476335a0754ccd0e1185c84]]
Former-commit-id: fabbc29fe8
Former-commit-id: 3f540d16f0
2013-05-15 09:40:05 -05:00
Nate Jensen
4973acb807 Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89

Former-commit-id: 5280b54277 [formerly 5280b54277 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]
Former-commit-id: 4e63b88031
Former-commit-id: 1e059ee8d9
2013-05-15 09:22:16 -05:00
Nate Jensen
58eeca454a Issue #1989 jetty fixes
Change-Id: I01c00ee8f754132b9c57d84f971d744c16dda07d

Former-commit-id: d894aca768 [formerly d894aca768 [formerly fecb2dc4da19aba5a188834780e33c791d312e1b]]
Former-commit-id: 958ed1f6a2
Former-commit-id: 1b62b066c9
2013-05-14 18:27:00 -05:00
Nate Jensen
dc98eb524f Merge "Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages" into development
Former-commit-id: a6f8174d0c [formerly a6f8174d0c [formerly eba0d622076180e2443e4dc71c8c2215ece28da7]]
Former-commit-id: 44cfe00b5e
Former-commit-id: e7f638ce3b
2013-05-14 16:36:47 -05:00
Nate Jensen
851885b8c5 Merge "Issue #1869 Get plots working without dataURI" into development
Former-commit-id: 6c42b5af64 [formerly 6c42b5af64 [formerly 3d4bbfa57651c97bc94d88ea83583a366a09200b]]
Former-commit-id: 661482f1dd
Former-commit-id: 301b294d66
2013-05-14 16:23:00 -05:00
Nate Jensen
925339b84c Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: 08b9ce4c62 [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]
Former-commit-id: 6f1684b85c
Former-commit-id: 22c23492c4
2013-05-14 16:16:13 -05:00
Dustin Johnson
f625b26373 Merge "Issue #2000 Subscription duplication/overlap detection" into development
Former-commit-id: 341ce0c8c2 [formerly 341ce0c8c2 [formerly db10de3aca3d0ef373df68a3de9871483128b645]]
Former-commit-id: a5a0e3e280
Former-commit-id: 21e66394be
2013-05-14 15:48:58 -05:00
Dustin Johnson
aa591995c6 Issue #2000 Subscription duplication/overlap detection
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5

Former-commit-id: db2e3cd9bb [formerly db2e3cd9bb [formerly 95df3d38914f451471f10d6095ad2bc6badbab72]]
Former-commit-id: fdf3ac7897
Former-commit-id: 085058e788
2013-05-14 15:34:08 -05:00
Ben Steffensmeier
8a1b518934 Issue #1869 Get plots working without dataURI
Former-commit-id: 79139629a6 [formerly 79139629a6 [formerly 855d95e8563c47e5601c80c9efe5006280bda76e]]
Former-commit-id: a84c975426
Former-commit-id: 2dfb65b594
2013-05-14 14:42:47 -05:00
Roger Ferrel
532787c043 Issue #1966 Initial setup.
Change-Id: I9b63433524fe419099e5646d028391377784d193

Former-commit-id: 0a02d5e018 [formerly 0a02d5e018 [formerly e36e62d3c146f10ef20a0d84abd26a96b9740827]]
Former-commit-id: 9f9f85f875
Former-commit-id: ab75cd5107
2013-05-14 13:49:53 -05:00
Richard Peter
a734c8594a Merge "Issue #1869 Modified D2D height Graphs to work without dataURI column." into development
Former-commit-id: 57d6790d5e [formerly 57d6790d5e [formerly 4503fe27c4760d681a3026fd0d9b4fd77f1b13cb]]
Former-commit-id: 6c406d6a8e
Former-commit-id: 3309e0c3b7
2013-05-14 09:40:21 -05:00
Richard Peter
b7fc98ce28 Merge "Issue #1869 Remove DataURI column from GFE. Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488" into development
Former-commit-id: 2f4b1d54a1 [formerly 2f4b1d54a1 [formerly f7d2c39ca0c70b627b2e72f5982fba11a6a683bd]]
Former-commit-id: b76d402c98
Former-commit-id: 17407e863a
2013-05-14 09:37:18 -05:00
Steve Harris
395d21565f 13.4.1-8 baseline
Former-commit-id: 19866e7032 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]
Former-commit-id: c59b52a266
Former-commit-id: a1c4cd2a39
2013-05-14 09:21:41 -04:00
Ben Steffensmeier
386ba183bf Issue #1869 Modified D2D height Graphs to work without dataURI column.
Former-commit-id: f856d0e02b [formerly f856d0e02b [formerly acb500b1581d4725eb31e73b362fd523752b11d9]]
Former-commit-id: 1d900e6b94
Former-commit-id: d0e1ff7ce3
2013-05-13 18:33:24 -05:00
Ben Steffensmeier
d78e7bcd78 Issue #1869 Remove DataURI column from GFE.
Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488

Former-commit-id: 2536042f6d [formerly 2536042f6d [formerly 4c35aa22bdd5058992984eca824083e927d8deda]]
Former-commit-id: 8661bde0cc
Former-commit-id: 039a92d9b9
2013-05-13 17:35:00 -05:00
Richard Peter
81ece036ac Issue #1951: Integrate warning_ugczone into parent tables and add active table indexes.
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea

Former-commit-id: 99391cfe12 [formerly 99391cfe12 [formerly 883a51484d03900852ed84820aa559e088c97335]]
Former-commit-id: d4135dba62
Former-commit-id: a02955e40c
2013-05-13 17:16:57 -05:00
Richard Peter
f7470fbd8f 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: a12830f762 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]
Former-commit-id: c5040038d3
Former-commit-id: bcf4dcc810
2013-05-13 17:11:05 -05:00
Richard Peter
4b5869684b 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: 8062c38b71 [formerly 8062c38b71 [formerly 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc]]
Former-commit-id: ba590e2f93
Former-commit-id: 8e5929406c
2013-05-13 16:33:50 -05:00
Dustin Johnson
a6532af8c9 Merge "Issue #1948 Modified registry permgen memory size to accomodate additional Spring container" into development
Former-commit-id: 0b2bdf1848 [formerly 0b2bdf1848 [formerly 46b88ec783b7721448940f158e5eb2ad168a3a97]]
Former-commit-id: ab755981a9
Former-commit-id: 0796694014
2013-05-13 15:26:19 -05:00
Benjamin Phillippe
b8a47cc9be Issue #1948 Modified registry permgen memory size to accomodate additional Spring container
Change-Id: I0492d5440f6753896fa6b278f0cf642a2ef13d65

Former-commit-id: 5a113f1c43 [formerly 5a113f1c43 [formerly 4e375316f389f1db4b21708893c0087587c3f3e9]]
Former-commit-id: 4165759e58
Former-commit-id: 2768c62541
2013-05-13 15:20:28 -05:00
Matt Nash
086696f386 Issue #1870 add python localization to base feature
Change-Id: I55149865870bc24995b267574ce2163b3c8f905c

Former-commit-id: 88365319b5 [formerly 88365319b5 [formerly 49b08468c487c8895c7fd59712936a79cf2b1999]]
Former-commit-id: 60d46cded8
Former-commit-id: 183c1a589a
2013-05-13 14:54:50 -05:00
Steve Harris
dffa6d3bdc 13.4.1-7 baseline
Former-commit-id: 4c6ff79e71 [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]
Former-commit-id: 8347bed50e
Former-commit-id: b35027f661
2013-05-13 12:58:10 -04:00
Ben Steffensmeier
62db2bdcd3 Issue #1993 Explicitly specify levels for CapeStk Derived parameter.
Former-commit-id: e5fc3f3835 [formerly e5fc3f3835 [formerly 1d5f8f6514129ca7dc1ba2607c92d92cc2f60937]]
Former-commit-id: 598ce2ae6c
Former-commit-id: b4c645f99f
2013-05-13 11:42:54 -05:00
Richard Peter
570a330497 Merge "Issue #1869 Modified D2D time series of point data to work without dataURI. Change-Id: I80f39877903e50338add58700f6ffeb39e848a32" into development
Former-commit-id: 18c5ad2727 [formerly 18c5ad2727 [formerly ac7b7bdf702eb75bb41631febe433354acf78589]]
Former-commit-id: 045a8c0b5d
Former-commit-id: c598cd3be0
2013-05-13 11:42:23 -05:00
Ben Steffensmeier
e17c6f6857 Issue #1869 Modified D2D time series of point data to work without dataURI.
Change-Id: I80f39877903e50338add58700f6ffeb39e848a32

Former-commit-id: 2b4dd1521b [formerly 2b4dd1521b [formerly 3f246d2d473050ae89a4db65bc01d7729dc0aa01]]
Former-commit-id: baf051a27e
Former-commit-id: 9aab9c6034
2013-05-13 11:26:47 -05:00
Matt Nash
2db79b7608 Issue #1991 change hydro database in setup.env to reflect new one
Change-Id: I2d7759ea34c4c8a63b484288603bd4988844c1dd

Former-commit-id: f5fe72f776 [formerly f5fe72f776 [formerly 8aac19338c40e2f278709c8bdbe85ec0b84c75d6]]
Former-commit-id: 1e354eddc4
Former-commit-id: c389c77256
2013-05-13 09:05:30 -05:00
Mike Duff
83304c3e4c Issue #1919 - Fix VGBs in FFMP
Former-commit-id: f887a41875 [formerly f887a41875 [formerly f5ab8a230b2c63bd025d32a2364a52b3536536d4]]
Former-commit-id: 7874521269
Former-commit-id: d262dc63f0
2013-05-10 09:58:02 -05:00
Dustin Johnson
da159a9c31 Merge "Issue #1967 undo mistake" into development
Former-commit-id: e82d454167 [formerly e82d454167 [formerly f0529c591755d871796a6d5acae43c443c8c301c]]
Former-commit-id: 519d46724a
Former-commit-id: b3be6bb88b
2013-05-10 09:25:58 -05:00
Nate Jensen
f3989b7187 Issue #1967 undo mistake
Change-Id: Ib74893b356edf16b045e1f8f5165bef59388422b

Former-commit-id: 250548dc66 [formerly 250548dc66 [formerly 2cd8c512ca8cbf0b7070587f659e9bc12f53e580]]
Former-commit-id: 47e402afc9
Former-commit-id: f8cd2effdf
2013-05-10 09:20:17 -05:00
Bryan Kowal
7896fa119b Issue #1995 - Wes2Bridge jar construction is now compatible with Eclipse 3.8.
Former-commit-id: e7bc2fecc6 [formerly e7bc2fecc6 [formerly 70d82ca1c40d02b1918d539d57b342f59d67e12b]]
Former-commit-id: c80ba9633e
Former-commit-id: 7cd6653d71
2013-05-09 19:51:32 -05:00
Bryan Kowal
a73af7bdc0 Issue #1927 - the rpm build will now correctly use the configurable uframe-eclipse location
Change-Id: I2e74909da3f08bf7ef355470786d018df248cb58

Former-commit-id: 5844657522 [formerly 5844657522 [formerly e9a9ed516bb3f1c9c2b4a768de07c46048de4077]]
Former-commit-id: baa6b26c34
Former-commit-id: eafa210750
2013-05-09 16:46:04 -05:00