Commit graph

222 commits

Author SHA1 Message Date
David Gillingham
be0570d2fe Issue #473: Properly archive text plugin records,
fix bugs in DatabaseArchiver.determineStartTime().

Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f

Former-commit-id: 04ab5d619b [formerly 526abfd36e [formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]
Former-commit-id: 526abfd36e
Former-commit-id: 8592a9a50d
2012-04-25 17:08:21 -05:00
David Gillingham
715dce7557 Issue #473: Fix CWA and TCS plugin's decoders to use ingest file name for datatime.
Change-Id: I54bbf7f1562ff48617721f6d88ef536c0afd7b61

Former-commit-id: 58e7a0f310 [formerly bdbc16d31c [formerly d3681dc1ed59d0f85b7de44277c52907d242aa29]]
Former-commit-id: bdbc16d31c
Former-commit-id: 30d5e0d2dd
2012-04-19 17:10:08 -05:00
Bryan Kowal
dbcc538fa8 Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build.
Former-commit-id: b90b6f101e [formerly b1561d67a0 [formerly 28f2145d82ce3030cebfb0a14aa8457fee992e13]]
Former-commit-id: b1561d67a0
Former-commit-id: 72068507a9
2012-04-19 13:09:58 -05:00
Richard Peter
2f351f13f7 Merge "Issue #449. Fixed problem with simulated time for trend plots in FSS monitors." into 9-Wes2Bridge
Former-commit-id: be060f1b1c [formerly 709be7733b [formerly 2a3492987c4cd9751aad2c6e20230f983e68f4b5]]
Former-commit-id: 709be7733b
Former-commit-id: 5bb20ff4a3
2012-04-17 13:16:22 -05:00
Steve Harris
6a1f2160bd Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
	edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java

Former-commit-id: fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]
Former-commit-id: ed26e06df2
Former-commit-id: c90ce9d54e
2012-04-10 12:50:03 -05:00
Slav Korolev
273abf0ca5 Issue #449. Fixed problem with simulated time for trend plots in FSS
monitors.

Former-commit-id: f02da69ff5 [formerly 8d29726365 [formerly 79b81f2a734142d212d7bc0ad3686c7b64f433c5]]
Former-commit-id: 8d29726365
Former-commit-id: bf5cf6a903
2012-04-09 14:50:19 -04:00
Bryan Kowal
1e2c3602c2 Issue #18 - jvm argument names are no longer used when re-configuring setup.env; renamed variables that referenced jettyPort.
Former-commit-id: 2386dd5890 [formerly 94b327d00f [formerly 1c18ec39ea8a1bf1867ee96d6a33a9c595951d1f]]
Former-commit-id: 94b327d00f
Former-commit-id: 898487c15c
2012-04-09 13:15:50 -05:00
Bryan Kowal
476ad5de1f Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.
Former-commit-id: 839d7c886f [formerly 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]
Former-commit-id: 1afa927c33
Former-commit-id: f49aadd9c8
2012-04-09 09:32:45 -05:00
Bryan Kowal
4d73e617c8 Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge
Former-commit-id: dcc3c7bb59 [formerly f1e81b1a95 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]]
Former-commit-id: f1e81b1a95
Former-commit-id: 21ff4bf657
2012-04-09 09:19:02 -05:00
David Gillingham
3b47db9541 Issue #435: Prevent NullPointerExceptions from being thrown when
serializing AirepRecords and NcAirepRecords.

Issue #435: Address peer review comments on previous change.

Change-Id: I7af20fd0d0d12c819c8df8aaba12318dcba574ac

Former-commit-id: e0e57577ff [formerly 87142f9f4e [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]]
Former-commit-id: 87142f9f4e
Former-commit-id: 5193184abf
2012-04-05 15:49:23 -05:00
Bryan Kowal
5f9463bc57 Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances.
Former-commit-id: 2ed20e107d [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]
Former-commit-id: e792b2a16f
Former-commit-id: 3e039dc79f
2012-04-04 18:29:13 -05:00
David Gillingham
ae703513d7 Issue #435: Ensure associated HDF5 data is always captured when
archiving PDOs, alter binlightning so insert time is based on
system time like all other plugins.

Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2

Issue #435: Add comment to previous change as requested by peer review, fix binlightning insert time.

Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2

Former-commit-id: e0e8e6d00a [formerly a9398fe4cd [formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]]
Former-commit-id: a9398fe4cd
Former-commit-id: c9d5823d2c
2012-04-03 14:16:33 -05:00
Max Schenkelberg
25cf44a674 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 07cf5069ba [formerly 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]
Former-commit-id: 9b0d01f8b5
Former-commit-id: 74458bfb73
2012-03-30 10:51:31 -05:00
Steve Harris
b4846ce8a8 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Former-commit-id: 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]
Former-commit-id: d3ad6095b7
Former-commit-id: a4e4792bb5
2012-03-30 09:50:48 -05:00
Steve Harris
760ead2047 12.3.1-10 baseline
Former-commit-id: 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 4068f5295f
Former-commit-id: 0e4128712b
2012-03-30 08:38:33 -05:00
Steve Harris
b05701d2d7 Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]
Former-commit-id: 70357d90bc
Former-commit-id: 0665862abe
2012-03-29 10:03:05 -05:00
Steve Harris
770ccb1520 Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 54a1d9cdbc [formerly 132d68acc6 [formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]]
Former-commit-id: 132d68acc6
Former-commit-id: 94e6323c0a
2012-03-29 10:01:55 -05:00
Max Schenkelberg
86d3763df0 Issue #358 Made wireframe shapes rely more on the grid geoemtry of the
descriptor than the actual descriptor as the descriptor is used purely
for convenience 

Former-commit-id: f10f1a5319 [formerly 15a9245592 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]
Former-commit-id: 15a9245592
Former-commit-id: 66eaffb9ee
2012-03-28 13:32:04 -05:00
Bryan Kowal
69e6f68295 Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
Former-commit-id: 31f989ecb4 [formerly 8a4c883e0b [formerly efc134f920b0cc0e493d74f1bb14b22fdc8013ca]]
Former-commit-id: 8a4c883e0b
Former-commit-id: 5ba68624c5
2012-03-21 16:49:38 -05:00
Greg Armendariz
f49e1f5e03 Merge "Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case." into 9-Wes2Bridge
Former-commit-id: d45249fb2f [formerly 65b8521ccb [formerly 866c197c927445c1572fd19da1ebd3c8dee46d97]]
Former-commit-id: 65b8521ccb
Former-commit-id: 9a0f313c23
2012-03-17 10:35:17 -05:00
Bryan Kowal
dd9c964943 Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case.
Former-commit-id: 64cdd27f62 [formerly 55a759fb8a [formerly 47807beb71c03e26cbe4fa78bf9cdb0811a51042]]
Former-commit-id: 55a759fb8a
Former-commit-id: 97cb8ab51c
2012-03-16 12:16:48 -05:00
Max Schenkelberg
a0663a2791 Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
case of "NO DATA"

Former-commit-id: b9085db25d [formerly cd6ebd80d4 [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]
Former-commit-id: cd6ebd80d4
Former-commit-id: 468c812dde
2012-03-16 10:13:31 -05:00
Max Schenkelberg
1b8beb3f8d Issue #358 Fixed sampling issue with mosaic resource with best
res resources

Former-commit-id: 258d57e825 [formerly cc111ab9ac [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]
Former-commit-id: cc111ab9ac
Former-commit-id: 97edff9f7c
2012-03-16 09:03:50 -05:00
Max Schenkelberg
732c2ddb5c Issue #358 Fixed painting and sampling regression in radar mosaic due to
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements

Former-commit-id: 556a270a09 [formerly 719f87c261 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]
Former-commit-id: 719f87c261
Former-commit-id: 10b720381b
2012-03-14 18:03:44 -05:00
David Gillingham
a1ac93704b Issue #20: Don't throw an exception if overriding a lower-localization
level's configuration (like overriding BASE's default plugin
configuration).

Former-commit-id: ed74b90589 [formerly 13af9170b1 [formerly b585768a8c7e3f42742efe5128ec6cb05c6424bf]]
Former-commit-id: 13af9170b1
Former-commit-id: e33083c11a
2012-03-14 15:07:59 -05:00
Max Schenkelberg
5a61f3ae23 Issue #358 Cleaned up mesh extension and API to use geotools for
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 50765e8a34 [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]
Former-commit-id: 6e5964df9d
Former-commit-id: 8fb7eccb73
2012-03-14 09:49:32 -05:00
David Gillingham
edde99f0b8 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: d433b7d4d6 [formerly e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]
Former-commit-id: e13850a2b6
Former-commit-id: 7e5ec12276
2012-03-13 12:31:38 -05:00
Steve Harris
229fa2944d Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: 10dc140747 [formerly 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]
Former-commit-id: 5bbf80a384
Former-commit-id: 6d2af585b1
2012-03-12 13:10:34 -05:00
Bryan Kowal
08451e8a63 Issue #419 - a -Dgit={true|false} switch will be used to determine if deploy-install will deploy from a single directory source tree or a multiple directory source tree. Removed tmp files that should not be baselined.
Former-commit-id: 66e05f4c96 [formerly 58bfa62981 [formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]]
Former-commit-id: 58bfa62981
Former-commit-id: eab9c845bb
2012-03-12 11:43:34 -05:00
Max Schenkelberg
3beecc1cdf Issue #358 Merging core drawing API improvements from Collaboration
Former-commit-id: 89f603f448 [formerly d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]
Former-commit-id: d43b0456d8
Former-commit-id: 18805c68f7
2012-03-09 12:31:50 -06:00
Bryan Kowal
6322415535 Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
Former-commit-id: b871752e3a [formerly fc1ca4efcc [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]]
Former-commit-id: fc1ca4efcc
Former-commit-id: 5838ff71f1
2012-03-08 09:00:55 -06:00
David Gillingham
d3fcc3bc54 Issue #361: Use queueCreator.sh to build the new ISC data receive QPID
queue.

Former-commit-id: 78c7f29096 [formerly 90a745a037 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]]
Former-commit-id: 90a745a037
Former-commit-id: 15a9e7cdae
2012-03-07 16:05:54 -06:00
Bryan Kowal
bdb4777017 Issue #202 - Removed questionable 12.2.1 changes to the soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now manually created needed directories. At one time the directories were probably baselined until we switched to git.
Former-commit-id: c803afd454 [formerly 4d8d3d4d00 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]]
Former-commit-id: 4d8d3d4d00
Former-commit-id: d4142689c9
2012-03-07 10:22:40 -06:00
David Gillingham
d3d2046df0 Issue #361: Fine tune synchronization in GfeScriptExecutor to prevent
massive backups in access to GfeScript instance map.

Issue #361: Further modifications to GfeScriptExecutor and GfeScript to improve synchronization-caused back-logs.

Change-Id: Ic33ef5e62d2bd1e19dd2cfedcfefe050cf7efe9e

Former-commit-id: 3cfa029f4b [formerly 9a75c87829 [formerly 679996850315f699d47633da5baf593c72ba7927]]
Former-commit-id: 9a75c87829
Former-commit-id: efc9e9000b
2012-03-06 16:24:58 -06:00
David Gillingham
b8acb1912c Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.

Former-commit-id: 1d69867594 [formerly ff231f33f4 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]]
Former-commit-id: ff231f33f4
Former-commit-id: 8d2ea4cfba
2012-03-05 16:49:23 -06:00
Bryan Kowal
3bd189df23 Issue #20 - additional new svn changes that have not been merged yet:
http://lightning.omaha.us.ray.com/redmine/projects/interim-svn-repository/repository/diff/trunk/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java?rev=48&rev_to=1

Former-commit-id: 00759729a4 [formerly bea56356fd [formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]]
Former-commit-id: bea56356fd
Former-commit-id: ed81095573
2012-03-05 14:36:56 -06:00
Bryan Kowal
3341371f4b Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 793dad5711 [formerly 5228de77e2 [formerly a5229ac02bb3c7e177b26dae68902321c9de986c]]
Former-commit-id: 5228de77e2
Former-commit-id: 6e8b4a188f
2012-03-05 13:46:10 -06:00
David Gillingham
364b9e19b3 Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.

Former-commit-id: 494fbe93db [formerly d68e3a7eea [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]
Former-commit-id: d68e3a7eea
Former-commit-id: 1908212c27
2012-03-05 11:23:11 -06:00
Max Schenkelberg
8438bc54db Issue #358 merged esb.camel project for plot update compatibility
Former-commit-id: 76e7a02f76 [formerly 0cf00cb7f4 [formerly ba90282320443c6c41c3188db9f43ffb11399bdd]]
Former-commit-id: 0cf00cb7f4
Former-commit-id: 225dfd15be
2012-03-02 13:26:44 -06:00
David Gillingham
87de9d067b Issue #346: Convert GFE to use identity-based ListenerLists, increase
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 0c0f659896 [formerly f6f0ca24df [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]
Former-commit-id: f6f0ca24df
Former-commit-id: bd01975367
2012-03-02 13:22:46 -06:00
Max Schenkelberg
7337ff7ed6 Issue #358 merged dataURI changes from thinclient in for plot
compatibility

Former-commit-id: 1f714b1a5b [formerly f96ff96259 [formerly 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de]]
Former-commit-id: f96ff96259
Former-commit-id: 4d91a4fd74
2012-03-02 12:24:19 -06:00
Max Schenkelberg
fe1811c167 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]
Former-commit-id: ae47d9683e
Former-commit-id: e2cd95d3f4
2012-03-01 16:59:40 -06:00
Steve Harris
994e79cfb3 Merge branch 'ss_sync' into sync_test
Former-commit-id: 787aed90f8 [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]
Former-commit-id: 951ecfe3dd
Former-commit-id: 3b9c3e3474
2012-03-01 14:01:16 -06:00
Steve Harris
5bf956755a Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 9bdea0399f [formerly c21bd2719c [formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]
Former-commit-id: c21bd2719c
Former-commit-id: 8794c4bcf6
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
5395e71757 Issue #353 apply the server time offset before requesting updates instead of after so that way there is no time gap for the first request
Change-Id: I3ceb8cefbedc3b64ca207c559e8cd381f6f184fd

Former-commit-id: 7c2409eab0 [formerly 49cce84edf [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]
Former-commit-id: 49cce84edf
Former-commit-id: aa90109f45
2012-03-01 12:44:43 -06:00
David Gillingham
33b41f1b0e Issue #20: Fix breakage to alertViz caused by changes to
FileUtil.join().

Former-commit-id: 8a45f1f4c3 [formerly c6803ba434 [formerly 8832c64ba47f87027d5215caf7d84b9fc6a187cd]]
Former-commit-id: c6803ba434
Former-commit-id: 6a2b7e12d6
2012-03-01 11:19:22 -06:00
Steve Harris
27fb50d455 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: dd52eb4d40 [formerly 703cb6e748 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]
Former-commit-id: 703cb6e748
Former-commit-id: 98d1fbeb0e
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
07d98eb7dc Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: c61e40c426 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]
Former-commit-id: 5c303ed189
Former-commit-id: 56d97c95d5
2012-02-29 15:49:47 -06:00
Bryan Kowal
4ba738041e Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 94d6af30f0 [formerly 47230422ce [formerly 8b2a29b3f76fc10ccb6ee2ee5401aa4dc2cab74c]]
Former-commit-id: 47230422ce
Former-commit-id: 861ca25a4e
2012-02-29 12:43:46 -06:00
Ben Steffensmeier
7c3545170d Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time.
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f

Former-commit-id: d7a63995f1 [formerly 5dee50e7e9 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]
Former-commit-id: 5dee50e7e9
Former-commit-id: 3713d7a181
2012-02-28 15:20:37 -06:00