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

36 commits

Author SHA1 Message Date
David Gillingham
c39ee5a3c0 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: 3b47db9541 [formerly 5193184abf] [formerly 87142f9f4e] [formerly e0e57577ff [formerly 87142f9f4e [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]]]
Former-commit-id: e0e57577ff
Former-commit-id: f9200a739ae6f82c440eea10738de05476856c19 [formerly 84f0765dba]
Former-commit-id: bef6e3d504
 2012-04-05 15:49:23 -05:00
David Gillingham
0fd14b8a0b 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: ae703513d7 [formerly c9d5823d2c] [formerly a9398fe4cd] [formerly e0e8e6d00a [formerly a9398fe4cd [formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]]]
Former-commit-id: e0e8e6d00a
Former-commit-id: 0f166301c2c892f4b1314f13084e1d03103fbf79 [formerly b4439bc5e8]
Former-commit-id: 4ff79099ac
 2012-04-03 14:16:33 -05:00
David Gillingham
d1bf70a7be 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: a1ac93704b [formerly e33083c11a] [formerly 13af9170b1] [formerly ed74b90589 [formerly 13af9170b1 [formerly b585768a8c7e3f42742efe5128ec6cb05c6424bf]]]
Former-commit-id: ed74b90589
Former-commit-id: 0292153c8495403a4ef38c31d54a54c78f7b0db8 [formerly 5dac19bde9]
Former-commit-id: 558c69401d
 2012-03-14 15:07:59 -05:00
Steve Harris
4d58cdca1b Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set 
Former-commit-id: 229fa2944d [formerly 6d2af585b1] [formerly 5bbf80a384] [formerly 10dc140747 [formerly 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]]
Former-commit-id: 10dc140747
Former-commit-id: 80cb0b251d26c0d96f2c7ee6601e3e0f30708bf4 [formerly 7bdde9f690]
Former-commit-id: 7fc8cf3d94
 2012-03-12 13:10:34 -05:00
Bryan Kowal
b0fc22d8ca 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: 3bd189df23 [formerly ed81095573] [formerly bea56356fd] [formerly 00759729a4 [formerly bea56356fd [formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]]]
Former-commit-id: 00759729a4
Former-commit-id: 418be3166347d739bc1c5f3e7660655a0b29b88f [formerly 1fda54a89b]
Former-commit-id: 0b690e438c
 2012-03-05 14:36:56 -06:00
David Gillingham
d5779b3101 Issue #20: Fix breakage to alertViz caused by changes to 
FileUtil.join().

Former-commit-id: 33b41f1b0e [formerly 6a2b7e12d6] [formerly c6803ba434] [formerly 8a45f1f4c3 [formerly c6803ba434 [formerly 8832c64ba47f87027d5215caf7d84b9fc6a187cd]]]
Former-commit-id: 8a45f1f4c3
Former-commit-id: 2791eec232ac17fe9ced7b27957c3b17a5fe3742 [formerly 953f8a6535]
Former-commit-id: 234801c998
 2012-03-01 11:19:22 -06:00
Steve Harris
2dbdc945bf 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: 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 6a444fc4fae979713c005a8d9737369a6bcbce84 [formerly 40d7357165]
Former-commit-id: 73a337bc31
 2012-02-27 15:58:49 -06:00
Steve Harris
13a3edd4f6 Merging SS OB12.2.1 into ss_sync 
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]
Former-commit-id: b55a488ed8
 2012-02-22 11:14:43 -06:00
Steve Harris
139d42c594 Merge branch 14-NCEP into 'ss_sync' 
Former-commit-id: a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]
Former-commit-id: 9995d22e25
Former-commit-id: dccb91e6d6462a59f41fcbab353272041948d51b [formerly aaead73ec5]
Former-commit-id: 610fdf3f4e
 2012-02-22 10:12:49 -06:00
Steve Harris
3371e158a6 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: 121ec88a98 [formerly ec0f1aebfc] [formerly b89ebc5e01] [formerly 496cc6a06b [formerly b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]]
Former-commit-id: 496cc6a06b
Former-commit-id: 8f3e38d67a9e00af420a14793a365b7fbe9bd292 [formerly 4a93298877]
Former-commit-id: dd3a5a8d88
 2012-02-20 16:38:06 -06:00
Bryan Kowal
e326a29d2f Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync. 
Former-commit-id: eda0f92b17 [formerly 5754f9dfd8] [formerly 10a0ca252d] [formerly 682c10767d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]]
Former-commit-id: 682c10767d
Former-commit-id: a057be46f691d8ed25cfea1a37709fd22cddecd5 [formerly 2ba23624b4]
Former-commit-id: cc8c6597a2
 2012-02-17 12:17:14 -06:00
Steve Harris
43c3cfdd1a Manual merge of SS OB12.1.2-4 changes into ss_sync 
Former-commit-id: 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]
Former-commit-id: b137302802
Former-commit-id: eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24]
Former-commit-id: 1ac6b36d1f
 2012-02-17 10:55:02 -06:00
Steve Harris
89aae82ed1 Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP 
Former-commit-id: c4ced8af2d [formerly 6aed9311a8] [formerly 7356d655da] [formerly 1707b98721 [formerly 7356d655da [formerly f3bac368dacad47036f9823243379fe6ed1d4869]]]
Former-commit-id: 1707b98721
Former-commit-id: 93362db30561096d2866d511737a68309011a825 [formerly db1e3b1215]
Former-commit-id: de85613a99
 2012-02-15 14:34:47 -06:00
David Gillingham
9a17298fb6 Issue #20: Committing refactored archiver capability 
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

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

Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Former-commit-id: a10e6766d8 [formerly 535821e5b8] [formerly bb1ac9959b] [formerly 061966f243 [formerly bb1ac9959b [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]]
Former-commit-id: 061966f243
Former-commit-id: 4931a468f096c3bd0bb7f0820c5d10d1c1c224aa [formerly 9f416558fa]
Former-commit-id: 3e42bc7d2d
 2012-02-13 16:09:36 -06:00
Lee Venable
d0735ec99a 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: fff6cd19f1 [formerly 65cf18fcbe] [formerly 9cc539f8a4] [formerly db74c784d6 [formerly 9cc539f8a4 [formerly bc6f1a41c0dee1c2030d1a2c90d337ddef20b36e]]]
Former-commit-id: db74c784d6
Former-commit-id: 94ddc6305e9dae65459ba667d6fb2c7f19077233 [formerly 74cd5a6f0b]
Former-commit-id: 724db373e9
 2012-02-08 09:06:55 -06:00
Lee Venable
cff8ad2c90 Merge "Issue #14 - Modified SHEF decoder components to respect the ALLOW_ARCHIVE_DATA "flag"" into 9-Wes2Bridge 
Former-commit-id: e6ca6377d0 [formerly 868c1517c1] [formerly a97a61c74c] [formerly 225aadb85b [formerly a97a61c74c [formerly 0693cb12fa60f15dbea2e38347a811b7964ed8fc]]]
Former-commit-id: 225aadb85b
Former-commit-id: 53a7b1cfaffcced8de2bc4443604a86017dc4beb [formerly ead1c644fd]
Former-commit-id: 34af1403bb
 2012-02-08 09:06:46 -06:00
Mike Duff
86b0c97761 Issue #16 - Added subdirectory to token value and fixed IndexOutOfBounds 
error

Change-Id: Ie0d670487a1768a53001209be0499c3cf5e9d4c7

Former-commit-id: f5613a0088 [formerly 504fdc8cf8] [formerly 60de2210f5] [formerly d8d84fbe2e [formerly 60de2210f5 [formerly 967c9d38fe967ab02cf620201c4fd9915f7ba3fc]]]
Former-commit-id: d8d84fbe2e
Former-commit-id: 8773dfd018bd59c5dd8b0cc6057c6b0f2a0291c2 [formerly 846110bac4]
Former-commit-id: 2300b2e6c7
 2012-02-07 16:46:36 -06:00
Mike Duff
aeb81d8859 Issue #16 - data/manual now uses subdirectories 
Change-Id: Iaeb5946767d635da1fe129296745bfa3eea57631

Former-commit-id: 8414865909 [formerly 208d6f91b7] [formerly 365a64ca27] [formerly f32cb51813 [formerly 365a64ca27 [formerly 61b937e10159a5690dcbdc2b41029f6f940dd5f6]]]
Former-commit-id: f32cb51813
Former-commit-id: 4e78997b303898e3d595d5bb8b8aace56f42745a [formerly bc390cf9ba]
Former-commit-id: e013f94fa4
 2012-02-02 09:11:19 -06:00
James Korman
d9b1252b82 Issue #13 Corrected valid month check - from code review 
Change-Id: I92d52e191749313b846871c5d8cd7c2fdc3c73c3
Former-commit-id: dab977a9ca [formerly e7d2719051] [formerly 5a5bb12712] [formerly 9e7e3a4ef2 [formerly 5a5bb12712 [formerly acc875bba511ea417237590671e1b2fccdb3125d]]]
Former-commit-id: 9e7e3a4ef2
Former-commit-id: 480a5d43c47725733e9bb93fa283a82f735ad6a3 [formerly 30d9e073fe]
Former-commit-id: dd16c1bec1
 2012-01-31 16:18:48 -06:00
Nate Jensen
2dec5b706e Issue #181 disable nctext-ingest 
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e

Former-commit-id: 0dea704a93 [formerly e61ff490b1] [formerly 1b32446288] [formerly f3ba2258df [formerly 1b32446288 [formerly a54d4b8e55c23411c0cb61eae8f57e8279c9f8e9]]]
Former-commit-id: f3ba2258df
Former-commit-id: f80cae6694c70fd33d6dc36a7beadcfa8acd394a [formerly 50e735ce0c]
Former-commit-id: 6bdb96c7ca
 2012-01-31 09:45:27 -06:00
Nate Jensen
1a53d8e998 Issue #181 fix ncep edex rpms 
Change-Id: Iaf7778d9b32e8136f74caf4ed37892149e8392cf

Former-commit-id: e831de315f [formerly 769731f21b] [formerly 0301af999e] [formerly 50c6816fa9 [formerly 0301af999e [formerly 17f8151b148ad8d645c81760bfa4820dc421490a]]]
Former-commit-id: 50c6816fa9
Former-commit-id: 8ca0afabd47b3ee479204f1a0d18506eadf1f7c9 [formerly ab7f9e5a56]
Former-commit-id: 121a29bdd1
 2012-01-30 15:56:50 -06:00
Greg Armendariz
83392a9666 Merge "Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts." into 9-Wes2Bridge 
Former-commit-id: f922263831 [formerly 324694d954] [formerly 906dad4b76] [formerly c34ed58ff5 [formerly 906dad4b76 [formerly 42fa4a177e61322ee5808111323546a0e9438bdc]]]
Former-commit-id: c34ed58ff5
Former-commit-id: b4e604a607662f42a03608aa32e99a090e8cbf7d [formerly 3c983de477]
Former-commit-id: e669c2ffdb
 2012-01-27 08:54:21 -06:00
David Gillingham
f2b58b2f16 Issue #20: Merge all changes from previous SVN repo to GIT. 
Former-commit-id: 91ecb60c1f [formerly b31f40ec9d] [formerly 845e6c19af] [formerly b056e18757 [formerly 845e6c19af [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]]
Former-commit-id: b056e18757
Former-commit-id: 589441ef8a8b0e931380208ea6dea9adff2ba461 [formerly 87b15de88b]
Former-commit-id: ea7a55ad8d
 2012-01-26 17:38:43 -06:00
Bryan Kowal
406c4ad5b3 Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts. 
Former-commit-id: da5e9f5bba [formerly c8dde3b1f6] [formerly f0b31d25f6] [formerly 71d08b6916 [formerly f0b31d25f6 [formerly b309c8b3d2726da589a057d31d2ae7592b82eb19]]]
Former-commit-id: 71d08b6916
Former-commit-id: 2b8ed7b794d5a320a8d0151eb8c6237c27c1f71a [formerly 1f254d0e0f]
Former-commit-id: ee70b7909c
 2012-01-26 17:38:17 -06:00
Bryan Kowal
a780e4269e Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts. 
Former-commit-id: a4cc5a6ba9 [formerly d042d202e4] [formerly fac21248ad] [formerly f4f398089b [formerly fac21248ad [formerly fc677d37985950823d3815054da39791d17c84ed]]]
Former-commit-id: f4f398089b
Former-commit-id: d76de022749a57c0130bfa277ad334d8a517f939 [formerly 6969c9b7ed]
Former-commit-id: 63340133d9
 2012-01-26 17:33:36 -06:00
James Korman
eb561063e3 Issue #13 - Modified/corrected handling of "ARCHIVE" time stamp 
Former-commit-id: 9eff1feaa0 [formerly d845a111af] [formerly 437c3bb05695e738de3ad86243572e48ccd21249 [formerly 53b5faf65b]] [formerly 4095a560a3 [formerly 53b5faf65b [formerly a6e1864763ea7b16cd8199121cc45ec3dd1299d5]]]
Former-commit-id: 4095a560a3
Former-commit-id: 6666f4f6134c72eb3e4f1fed3d77af371e2ba0ca [formerly bf2e363042]
Former-commit-id: bb29d1fdfc
 2012-01-25 16:38:43 -06:00
James Korman
ce32007bdb Issue #14 - Modified SHEF decoder components to respect the 
ALLOW_ARCHIVE_DATA "flag"

Former-commit-id: 017319df69 [formerly 91fe9b7d1d] [formerly 785e74370a] [formerly 217d384449 [formerly 785e74370a [formerly 6edc7e3bbb8e2cf9ca3bea809308bfd760e3f799]]]
Former-commit-id: 217d384449
Former-commit-id: 1648c7430eb67bee96b2947aa6e7b87c12e83c9a [formerly 931e69f245]
Former-commit-id: f3a9004183
 2012-01-25 16:35:23 -06:00
Dave Hladky
36d48978af Issue #15 Wes2Bridge time settings 
Former-commit-id: bf2470f405 [formerly 66fbee3e04] [formerly 594412a5b5] [formerly b03b324ead [formerly 594412a5b5 [formerly 61cb464263b06c01f4ea0b7270628f03e9e48d5a]]]
Former-commit-id: b03b324ead
Former-commit-id: 2479f0c7510c79fa38a277d7f43ba5ff441b9d5a [formerly 2d53cfbe41]
Former-commit-id: 4e8acfaba3
 2012-01-25 10:53:51 -06:00
mpduff
c0bb08e04d Issue #16 - data/manual now uses subdirectories 
Change-Id: I19786d4a39b2f7363b9eccd3ef00cd2ddf7d46fb
Former-commit-id: ba3656aebd [formerly 6b70dd6462] [formerly 59c8cbf1f3] [formerly 24efc2ee93 [formerly 59c8cbf1f3 [formerly 3619411519db0fe5df90e47ca478f083931817ec]]]
Former-commit-id: 24efc2ee93
Former-commit-id: 029cab0fd8e2390b796b6d2ef9a36da598fd8654 [formerly 5deccb8bf5]
Former-commit-id: b1887fbdb8
 2012-01-24 12:27:11 -06:00
Nate Jensen
f8f70f6a4c Issue #181 fixing edex feature and component deploys 
Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d

Former-commit-id: a8c1e39554 [formerly fae8fd5a6d] [formerly 8e3730adbf] [formerly 1dabb12dce [formerly 8e3730adbf [formerly 0c82def5c753aab240848aac8dc906a161461ac3]]]
Former-commit-id: 1dabb12dce
Former-commit-id: 293fd5a235bdb1e4c85b58d55c98c802941e8fe6 [formerly 9c4ad58867]
Former-commit-id: 802607c79f
 2012-01-24 12:15:01 -06:00
Nate Jensen
bf2e1850f3 Issue #181 integrating ncep edex code 
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3

Former-commit-id: daa0663af0 [formerly 6366bc35cb] [formerly fe52a35f7a] [formerly 33756de9c8 [formerly fe52a35f7a [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]]]
Former-commit-id: 33756de9c8
Former-commit-id: 2cdd1911db9699c1da43ed376abd9ca94f036c25 [formerly 3b7a082f41]
Former-commit-id: 7301ad5c66
 2012-01-24 09:59:50 -06:00
Nate Jensen
c1ca48ab19 Issue #181 integrating ncep edex code 
Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf

Former-commit-id: adb8188f98 [formerly 873469f771] [formerly f96e6a822b] [formerly a015cc136b [formerly f96e6a822b [formerly 71d87e07ef1d5ce2509fddce9170870a5950ba7b]]]
Former-commit-id: a015cc136b
Former-commit-id: bf42c95476b1354c34e606131e248046867b8dff [formerly e951995736]
Former-commit-id: ba529c4a12
 2012-01-24 09:49:27 -06:00
Bryan Kowal
4c4fc64253 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml. 
Former-commit-id: 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 2b5ee4b940 [formerly 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: e24d39003e4489633c8f3c358cda877ba7831b9e [formerly 2a7b92ec91]
Former-commit-id: a1dbdff475
 2012-01-20 11:37:38 -06:00
Matt Nash
418e6ed431 remove files that were removed at some point 
Former-commit-id: 02bb8004f8 [formerly 3189a44cb0] [formerly aec4a78b47] [formerly 88fc441c0f [formerly aec4a78b47 [formerly 952fab8cf1d3b86eba055cef96954a2807d6ecf6]]]
Former-commit-id: 88fc441c0f
Former-commit-id: c68534675f454c2e9d3e8422b15ffce661cb9771 [formerly 68fc4dd901]
Former-commit-id: 8b9dd8c9c1
 2012-01-19 14:31:53 -06:00
Matt Nash
fa4cd88c90 Moving 12.1.1 into ss_sync 
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
 2012-01-19 11:53:12 -06:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
 2012-01-06 08:55:05 -06:00