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

73 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bryan Kowal
774d05de1b Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge 
Former-commit-id: 21ff4bf657 [formerly f1e81b1a95] [formerly dcc3c7bb59 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]]
Former-commit-id: dcc3c7bb59
Former-commit-id: 240c3a1806
 2012-04-09 09:19:02 -05:00
David Gillingham
bef6e3d504 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: 5193184abf [formerly 87142f9f4e] [formerly e0e57577ff [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]]
Former-commit-id: e0e57577ff
Former-commit-id: 84f0765dba
 2012-04-05 15:49:23 -05:00
Bryan Kowal
edb7431d0a 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: 3e039dc79f [formerly e792b2a16f] [formerly 2ed20e107d [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]
Former-commit-id: 2ed20e107d
Former-commit-id: 5f4d6f600a
 2012-04-04 18:29:13 -05:00
David Gillingham
4ff79099ac 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: c9d5823d2c [formerly a9398fe4cd] [formerly e0e8e6d00a [formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]]
Former-commit-id: e0e8e6d00a
Former-commit-id: b4439bc5e8
 2012-04-03 14:16:33 -05:00
Bryan Kowal
e27502effd Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly. 
Former-commit-id: 5ba68624c5 [formerly 8a4c883e0b] [formerly 31f989ecb4 [formerly efc134f920b0cc0e493d74f1bb14b22fdc8013ca]]
Former-commit-id: 31f989ecb4
Former-commit-id: 81a360d139
 2012-03-21 16:49:38 -05:00
Greg Armendariz
bf867f91d3 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: 9a0f313c23 [formerly 65b8521ccb] [formerly d45249fb2f [formerly 866c197c927445c1572fd19da1ebd3c8dee46d97]]
Former-commit-id: d45249fb2f
Former-commit-id: f5c96c4af2
 2012-03-17 10:35:17 -05:00
Bryan Kowal
3914878a65 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: 97cb8ab51c [formerly 55a759fb8a] [formerly 64cdd27f62 [formerly 47807beb71c03e26cbe4fa78bf9cdb0811a51042]]
Former-commit-id: 64cdd27f62
Former-commit-id: 117306c734
 2012-03-16 12:16:48 -05:00
David Gillingham
558c69401d 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: e33083c11a [formerly 13af9170b1] [formerly ed74b90589 [formerly b585768a8c7e3f42742efe5128ec6cb05c6424bf]]
Former-commit-id: ed74b90589
Former-commit-id: 5dac19bde9
 2012-03-14 15:07:59 -05:00
Steve Harris
7fc8cf3d94 Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set 
Former-commit-id: 6d2af585b1 [formerly 5bbf80a384] [formerly 10dc140747 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]
Former-commit-id: 10dc140747
Former-commit-id: 7bdde9f690
 2012-03-12 13:10:34 -05:00
Bryan Kowal
0b690e438c 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: ed81095573 [formerly bea56356fd] [formerly 00759729a4 [formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]]
Former-commit-id: 00759729a4
Former-commit-id: 1fda54a89b
 2012-03-05 14:36:56 -06:00
David Gillingham
234801c998 Issue #20: Fix breakage to alertViz caused by changes to 
FileUtil.join().

Former-commit-id: 6a2b7e12d6 [formerly c6803ba434] [formerly 8a45f1f4c3 [formerly 8832c64ba47f87027d5215caf7d84b9fc6a187cd]]
Former-commit-id: 8a45f1f4c3
Former-commit-id: 953f8a6535
 2012-03-01 11:19:22 -06:00
Bryan Kowal
421c425047 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp. 
Former-commit-id: 861ca25a4e [formerly 47230422ce] [formerly 94d6af30f0 [formerly 8b2a29b3f76fc10ccb6ee2ee5401aa4dc2cab74c]]
Former-commit-id: 94d6af30f0
Former-commit-id: ca62eb90f3
 2012-02-29 12:43:46 -06:00
Nate Jensen
414785ee0e Integrating Richard's changes with 12.2.1 
Change-Id: I774e69f166dbc48c7cb31d066cb8bf5dd626520c

Former-commit-id: a22448c3d5 [formerly 2515d56c9f] [formerly c5ba181cd8 [formerly 50680111c00b8d2bec9f2479a0cc22380ef6ecfe]]
Former-commit-id: c5ba181cd8
Former-commit-id: 699e417731
 2012-02-28 09:42:47 -06:00
Nate Jensen
a65f8d8242 Integrating Richard's changes with 12.2.1 
Change-Id: I1831502d72bed7b804287bb7c3e4ea501514ada4

Former-commit-id: 94ae63b740 [formerly d18a15535a] [formerly afe3c5db9c [formerly 729a478cf151a4d61bb31adba4193c3fc33717a1]]
Former-commit-id: afe3c5db9c
Former-commit-id: 74b6e7b389
 2012-02-28 09:37:45 -06:00
Steve Harris
73a337bc31 Merge branch 'ss_sync' into 9-Wes2Bridge 
Conflicts:
	.gitignore
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

deleted h5 files
using ss_sync version of java files


Former-commit-id: 24059a5b4e [formerly 9b67525e95] [formerly e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]
Former-commit-id: e5b56c99ab
Former-commit-id: 40d7357165
 2012-02-27 15:58:49 -06:00
Steve Harris
d83100c3df removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore 
Former-commit-id: 07ac42866c [formerly c502603907] [formerly ecb38ba165 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]
Former-commit-id: ecb38ba165
Former-commit-id: a9b900821a
 2012-02-23 12:45:50 -06:00
Steve Harris
1954443885 Merge branch 'OB12.2.1_test' into ss_sync 
Former-commit-id: 7966ab9369 [formerly 6f7f678590] [formerly 830038b0c6 [formerly 76967f2151dcfb275be389c04060ff34be4a5018]]
Former-commit-id: 830038b0c6
Former-commit-id: 5f6715ed05
 2012-02-23 07:53:15 -06:00
Bryan Kowal
53f4674f25 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp. 
Former-commit-id: 0f02d05283 [formerly 9a63901c0e] [formerly cd35220cf7 [formerly 979af119b4da4e99e0ee2f090b9c28c02db7f7a3]]
Former-commit-id: cd35220cf7
Former-commit-id: 5ca7ce8373
 2012-02-22 17:07:15 -06:00
Steve Harris
83618ae62b creating OB12.2.1 from ss_sync for testing 
Former-commit-id: 4ff546d3fd [formerly a7b68a50be] [formerly 1fc25c6cb2 [formerly 5ea9539870491d7ea3d1a050b700a17d18ecee1d]]
Former-commit-id: 1fc25c6cb2
Former-commit-id: aaf2fbd05b
 2012-02-22 13:06:47 -06:00
Steve Harris
b55a488ed8 Merging SS OB12.2.1 into ss_sync 
Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
 2012-02-22 11:14:43 -06:00
Steve Harris
610fdf3f4e Merge branch 14-NCEP into 'ss_sync' 
Former-commit-id: 85075e6107 [formerly 94c2ea985b] [formerly 9995d22e25 [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 9995d22e25
Former-commit-id: aaead73ec5
 2012-02-22 10:12:49 -06:00
Steve Harris
dd3a5a8d88 Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge 
Conflicts:
	.gitignore
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
	deltaScripts/.pydevproject
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java

Former-commit-id: ec0f1aebfc [formerly b89ebc5e01] [formerly 496cc6a06b [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]
Former-commit-id: 496cc6a06b
Former-commit-id: 4a93298877
 2012-02-20 16:38:06 -06:00
Bryan Kowal
cc8c6597a2 Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync. 
Former-commit-id: 5754f9dfd8 [formerly 10a0ca252d] [formerly 682c10767d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]
Former-commit-id: 682c10767d
Former-commit-id: 2ba23624b4
 2012-02-17 12:17:14 -06:00
Steve Harris
1ac6b36d1f Manual merge of SS OB12.1.2-4 changes into ss_sync 
Former-commit-id: c209d6de36 [formerly 93f6535bd8] [formerly b137302802 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: b137302802
Former-commit-id: 65b22abd24
 2012-02-17 10:55:02 -06:00
Steve Harris
de85613a99 Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP 
Former-commit-id: 6aed9311a8 [formerly 7356d655da] [formerly 1707b98721 [formerly f3bac368dacad47036f9823243379fe6ed1d4869]]
Former-commit-id: 1707b98721
Former-commit-id: db1e3b1215
 2012-02-15 14:34:47 -06:00
Steve Harris
98b223d08e Added the patch/bin directory and company to the installer.ldm for rpm builds 
Former-commit-id: 74c156e508 [formerly 5e47f8c33a] [formerly a91b01bfbe [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]]
Former-commit-id: a91b01bfbe
Former-commit-id: 39b13d7102
 2012-02-15 12:54:54 -06:00
David Gillingham
3e42bc7d2d Issue #20: Committing refactored archiver capability 
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Issue #20: Address peer review comments from previous commit.

Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Former-commit-id: 535821e5b8 [formerly bb1ac9959b] [formerly 061966f243 [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]
Former-commit-id: 061966f243
Former-commit-id: 9f416558fa
 2012-02-13 16:09:36 -06:00
Steve Harris
c2603de1b8 Merge "Issue #192 gitignore changes" into ss_sync 
Former-commit-id: ece695a374 [formerly 4eef9c3c20] [formerly 35cc62582b [formerly e019344c6f96c6db35ede5985779eab537df523c]]
Former-commit-id: 35cc62582b
Former-commit-id: a6b95a2e81
 2012-02-08 09:09:28 -06:00
Lee Venable
724db373e9 Merge changes I92d52e19,Ia6e18647 into 9-Wes2Bridge 
* changes:
  Issue #13 Corrected valid month check - from code review Change-Id: I92d52e191749313b846871c5d8cd7c2fdc3c73c3
  Issue #13 - Modified/corrected handling of "ARCHIVE" time stamp


Former-commit-id: 65cf18fcbe [formerly 9cc539f8a4] [formerly db74c784d6 [formerly bc6f1a41c0dee1c2030d1a2c90d337ddef20b36e]]
Former-commit-id: db74c784d6
Former-commit-id: 74cd5a6f0b
 2012-02-08 09:06:55 -06:00
Lee Venable
34af1403bb Merge "Issue #14 - Modified SHEF decoder components to respect the ALLOW_ARCHIVE_DATA "flag"" into 9-Wes2Bridge 
Former-commit-id: 868c1517c1 [formerly a97a61c74c] [formerly 225aadb85b [formerly 0693cb12fa60f15dbea2e38347a811b7964ed8fc]]
Former-commit-id: 225aadb85b
Former-commit-id: ead1c644fd
 2012-02-08 09:06:46 -06:00
Mike Duff
2300b2e6c7 Issue #16 - Added subdirectory to token value and fixed IndexOutOfBounds 
error

Change-Id: Ie0d670487a1768a53001209be0499c3cf5e9d4c7

Former-commit-id: 504fdc8cf8 [formerly 60de2210f5] [formerly d8d84fbe2e [formerly 967c9d38fe967ab02cf620201c4fd9915f7ba3fc]]
Former-commit-id: d8d84fbe2e
Former-commit-id: 846110bac4
 2012-02-07 16:46:36 -06:00
Steve Harris
8384400190 Merge "Issue #16 - data/manual now uses subdirectories (2)" into 9-Wes2Bridge 
Former-commit-id: 0d5ce3a848 [formerly 64295a4ab4] [formerly 127aee04f8 [formerly bad345b999d31c31ff34669b8664afb8f907460f]]
Former-commit-id: 127aee04f8
Former-commit-id: 2f928d6d77
 2012-02-07 16:36:34 -06:00
Mike Duff
edaff0b763 Issue #16 - data/manual now uses subdirectories (2) 
Change-Id: I19786d4a39b2f7363b9eccd3ef00cd2ddf7d46fb

Former-commit-id: d3f58a0bf6 [formerly 97d5923be9] [formerly f194c39a7f [formerly 627d7e59756a5cb27a450d8839e62a9bb9995a56]]
Former-commit-id: f194c39a7f
Former-commit-id: 122937e1b2
 2012-02-07 16:30:13 -06:00
Matt Nash
203ec03a08 Issue #192 gitignore changes 
Former-commit-id: 7d36323ae9 [formerly 5fdadf4333] [formerly 426da850d3 [formerly 68f511221d4b198be50e1cf2a81723b8c3578a61]]
Former-commit-id: 426da850d3
Former-commit-id: 380179f10d
 2012-02-03 15:03:21 -06:00
Mike Duff
e013f94fa4 Issue #16 - data/manual now uses subdirectories 
Change-Id: Iaeb5946767d635da1fe129296745bfa3eea57631

Former-commit-id: 208d6f91b7 [formerly 365a64ca27] [formerly f32cb51813 [formerly 61b937e10159a5690dcbdc2b41029f6f940dd5f6]]
Former-commit-id: f32cb51813
Former-commit-id: bc390cf9ba
 2012-02-02 09:11:19 -06:00
James Korman
dd16c1bec1 Issue #13 Corrected valid month check - from code review 
Change-Id: I92d52e191749313b846871c5d8cd7c2fdc3c73c3
Former-commit-id: e7d2719051 [formerly 5a5bb12712] [formerly 9e7e3a4ef2 [formerly acc875bba511ea417237590671e1b2fccdb3125d]]
Former-commit-id: 9e7e3a4ef2
Former-commit-id: 30d9e073fe
 2012-01-31 16:18:48 -06:00
Nate Jensen
7afc75204c Merge "Issue #181 disable nctext-ingest" into 14-NCEP 
Former-commit-id: da5bc7b50f [formerly 7490a7d0ed] [formerly e4dc370101 [formerly 0d01c3c0597e1be074d13c3a3e6ce188878e220f]]
Former-commit-id: e4dc370101
Former-commit-id: 0b6bde1664
 2012-01-31 09:51:16 -06:00
Nate Jensen
6bdb96c7ca Issue #181 disable nctext-ingest 
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e

Former-commit-id: e61ff490b1 [formerly 1b32446288] [formerly f3ba2258df [formerly a54d4b8e55c23411c0cb61eae8f57e8279c9f8e9]]
Former-commit-id: f3ba2258df
Former-commit-id: 50e735ce0c
 2012-01-31 09:45:27 -06:00
Steve Harris
f0bbc94a6c Merge "Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups." into 14-NCEP 
Former-commit-id: 40d4ed8433 [formerly 2cd9e2af22] [formerly 801f50b944 [formerly 20c2f61be3e070a0223a94196ff91397de184d42]]
Former-commit-id: 801f50b944
Former-commit-id: 9587218b75
 2012-01-30 16:12:23 -06:00
Steve Harris
9cde064bb1 Merge "Issue #202 - no longer build edex-ncep-nsharp for the ncep branch." into 14-NCEP 
Former-commit-id: 7ae33d70c4 [formerly 028bc69fbb] [formerly 5216f0ff9e [formerly 0eb4e14fe793e94be2390693c2c06c29547d48a1]]
Former-commit-id: 5216f0ff9e
Former-commit-id: 05a088f9d1
 2012-01-30 16:12:03 -06:00
Bryan Kowal
e17a1e06a7 Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups. 
Former-commit-id: 00c0ab406b [formerly 40c0e93995] [formerly 7d21e3149e [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]]
Former-commit-id: 7d21e3149e
Former-commit-id: e9d85fc09c
 2012-01-30 16:05:17 -06:00
Bryan Kowal
b271da085c Issue #202 - no longer build edex-ncep-nsharp for the ncep branch. 
Former-commit-id: b6a8534258 [formerly 998337f9f4] [formerly 2554090d0d [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]]
Former-commit-id: 2554090d0d
Former-commit-id: 2745f9cac7
 2012-01-30 16:01:45 -06:00
Nate Jensen
121a29bdd1 Issue #181 fix ncep edex rpms 
Change-Id: Iaf7778d9b32e8136f74caf4ed37892149e8392cf

Former-commit-id: 769731f21b [formerly 0301af999e] [formerly 50c6816fa9 [formerly 17f8151b148ad8d645c81760bfa4820dc421490a]]
Former-commit-id: 50c6816fa9
Former-commit-id: ab7f9e5a56
 2012-01-30 15:56:50 -06:00
Ron Anderson
d4dcc14bd6 Merge "Issue #19 Committed changes to Wes2Bridge branch." into 9-Wes2Bridge 
Former-commit-id: cb1d052ff4 [formerly 3db925c9d4] [formerly e99cd12301 [formerly 2af10d5d34da1497f879b3be4b8e7d68ddec1ed2]]
Former-commit-id: e99cd12301
Former-commit-id: 34a1fecc66
 2012-01-30 13:30:47 -06:00
Greg Armendariz
e669c2ffdb Merge "Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts." into 9-Wes2Bridge 
Former-commit-id: 324694d954 [formerly 906dad4b76] [formerly c34ed58ff5 [formerly 42fa4a177e61322ee5808111323546a0e9438bdc]]
Former-commit-id: c34ed58ff5
Former-commit-id: 3c983de477
 2012-01-27 08:54:21 -06:00
David Gillingham
ea7a55ad8d Issue #20: Merge all changes from previous SVN repo to GIT. 
Former-commit-id: b31f40ec9d [formerly 845e6c19af] [formerly b056e18757 [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]
Former-commit-id: b056e18757
Former-commit-id: 87b15de88b
 2012-01-26 17:38:43 -06:00
Bryan Kowal
ee70b7909c Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts. 
Former-commit-id: c8dde3b1f6 [formerly f0b31d25f6] [formerly 71d08b6916 [formerly b309c8b3d2726da589a057d31d2ae7592b82eb19]]
Former-commit-id: 71d08b6916
Former-commit-id: 1f254d0e0f
 2012-01-26 17:38:17 -06:00
Bryan Kowal
63340133d9 Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts. 
Former-commit-id: d042d202e4 [formerly fac21248ad] [formerly f4f398089b [formerly fc677d37985950823d3815054da39791d17c84ed]]
Former-commit-id: f4f398089b
Former-commit-id: 6969c9b7ed
 2012-01-26 17:33:36 -06:00
Nate Jensen
637a516ae5 Issue #181 fix ncep 
Change-Id: If0e2947c33523ada50036212666867a7c5138c17

Former-commit-id: f3875948e8 [formerly ca923b9475] [formerly 15e0a5e68d [formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]]
Former-commit-id: 15e0a5e68d
Former-commit-id: 29be9b82bd
 2012-01-26 17:28:06 -06:00
Nate Jensen
710bcd1d8d Issue #181 fix empty src dirs 
Change-Id: If03015cf64f5791b4f5b340cc6aba4514a6a6d43

Former-commit-id: 3c2701dd43 [formerly 6fabe216d8] [formerly 638f900d41 [formerly 25ad3a67efb293afc2bf3ef9442ff2fc296bef18]]
Former-commit-id: 638f900d41
Former-commit-id: 18540298b4
 2012-01-26 15:42:55 -06:00