Commit graph

1450 commits

Author SHA1 Message Date
Steve Harris
397cac3352 Merge "Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml" into development
Former-commit-id: ac834c0ebb [formerly f5c87b04d6] [formerly 956e1a45da [formerly ce25af9ad1e713bd85fd24f10188c9f46c83da5c]]
Former-commit-id: 956e1a45da
Former-commit-id: a5ca238e96
2012-11-14 10:19:27 -06:00
Ben Steffensmeier
7590451249 Issue #1331 fix grib-request spring
Former-commit-id: 23190381cd [formerly b128a3f3c5] [formerly c97223458e [formerly 3b4dda66b20f04915f406df814ca989350794ae7]]
Former-commit-id: c97223458e
Former-commit-id: 60743ec4b1
2012-11-14 10:07:44 -06:00
Brad Gonzales
cc8ed35821 Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml
Change-Id: I6de95db502206b7b4dda198d61844570ed428862

Former-commit-id: 782ffb92ea [formerly 4af27e092f] [formerly 1617341e2a [formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]
Former-commit-id: 1617341e2a
Former-commit-id: c024c94050
2012-11-14 09:39:26 -06:00
Steve Harris
21ecd53719 Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 00f3d51546
Former-commit-id: c8cac52915
2012-11-13 17:28:50 -06:00
Steve Harris
2e3662028f 12.12.1-3 baseline
Former-commit-id: a81c46987b [formerly c999505fba] [formerly b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2797cbcdd0
2012-11-13 17:27:04 -06:00
Steve Harris
111e7607cf 12.12.1-2 baseline
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: 6868eb9b23
Former-commit-id: df89fe9bed
2012-11-13 17:14:24 -06:00
Lee Venable
77af9b8699 Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
Former-commit-id: 2827143110 [formerly 989d5dc5e4] [formerly dbdfda1d04 [formerly 7f22292e89e05b881466efd1d81ef851c454246a]]
Former-commit-id: dbdfda1d04
Former-commit-id: 282e8858da
2012-11-13 16:02:05 -06:00
Steve Harris
6db07e2e5e Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
Former-commit-id: 1f1659cb16 [formerly 63b0f18a89] [formerly 5c23f057b3 [formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]
Former-commit-id: 5c23f057b3
Former-commit-id: 1e0ad343d6
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
109ec1e778 Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: e8090e654b
Former-commit-id: 60f78c22e3
2012-11-13 16:00:19 -06:00
Roger Ferrel
c498e21b23 Issue #1298 Changes for non-blocking SetValueDialog.
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f

Former-commit-id: cbacc77367 [formerly 1d5bd95866] [formerly dceb2cde5d [formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]
Former-commit-id: dceb2cde5d
Former-commit-id: 29eb436b19
2012-11-13 15:53:03 -06:00
Lee Venable
3d07136ccc Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
Former-commit-id: 5b4f3c68f1 [formerly c1e46f52ca] [formerly 9d149bef29 [formerly 795564ae453a7afb423980679c3719a7c453aa74]]
Former-commit-id: 9d149bef29
Former-commit-id: 32f088d986
2012-11-13 15:35:13 -06:00
Lee Venable
69888e4517 Merge "Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open." into development
Former-commit-id: 20548994dd [formerly 0c936a3f8c] [formerly d935fff585 [formerly f037a61c9fd0c0d85a7596b95cdd35072f7bafe0]]
Former-commit-id: d935fff585
Former-commit-id: a78cdc9ee4
2012-11-13 15:34:40 -06:00
Roger Ferrel
1272837397 Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0

Former-commit-id: 6f6b9dd21a [formerly 1e8dfdc857] [formerly b421a30116 [formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]
Former-commit-id: b421a30116
Former-commit-id: d646f32d6e
2012-11-13 13:20:28 -06:00
Lee Venable
39f2ebaf14 Merge "Issue #1317 - Fix problem in edexProcessStats.xml" into development
Former-commit-id: 4b8129ea58 [formerly 5fce4fde98] [formerly 548973dae0 [formerly bde192a2c922a9bb239d1558794cf03ec6944118]]
Former-commit-id: 548973dae0
Former-commit-id: 89e28445e5
2012-11-13 13:19:00 -06:00
Roger Ferrel
c1c0e53b2d Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081

Former-commit-id: e3ae2eb355 [formerly 22f8bc10f0] [formerly 4c3af2a258 [formerly 4da71d30d62eeeee3546c3019850e77cab757c78]]
Former-commit-id: 4c3af2a258
Former-commit-id: 8e85e1c8df
2012-11-13 12:55:33 -06:00
Ron Anderson
d6a33fb39f Issue #1325 Update geotools source path entries per code review.
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0

Former-commit-id: 1bb7258935 [formerly 8a5a2dc532] [formerly 795dfdc9dd [formerly fc0837f4b3219eaa7ae4a99dee6db1da9a80c3ba]]
Former-commit-id: 795dfdc9dd
Former-commit-id: bad09a9c0d
2012-11-13 12:06:54 -06:00
Mike Duff
b91dca252e Issue #1317 - Fix problem in edexProcessStats.xml
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03

Former-commit-id: 248db814c1 [formerly 0e32ab85db] [formerly e14b372f42 [formerly 756c1b6b22cdf91c44f4bb1ec75dca8bb8074eef]]
Former-commit-id: e14b372f42
Former-commit-id: 363aa7bec6
2012-11-13 11:44:02 -06:00
Roger Ferrel
122a5cf0a4 Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
Changes from reviewer's comments.

Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f

Former-commit-id: fdfa0f2030 [formerly 5ce67ffd9e] [formerly ae52206cc7 [formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]
Former-commit-id: ae52206cc7
Former-commit-id: 30c70cc181
2012-11-13 09:49:16 -06:00
Nate Jensen
2be953df6b Merge "Issue #1324 make times display in 24 hour time" into development
Former-commit-id: ca20259c16 [formerly 8a07ba3c11] [formerly e7045022ad [formerly 40c13a1ca4345f791c9f6f3849fe896ba27a2830]]
Former-commit-id: e7045022ad
Former-commit-id: 7baf10fc53
2012-11-13 09:28:05 -06:00
Ron Anderson
a4d6e197be Merge "Issue #1325 Update GeoTools for WA4.7" into development
Former-commit-id: 8632dfa784 [formerly 024d384292] [formerly 41f68a9cac [formerly c7fe4cfae35393df26461d4c4892c2bbfaad0fbe]]
Former-commit-id: 41f68a9cac
Former-commit-id: d07cb8c041
2012-11-13 09:17:32 -06:00
Nate Jensen
9170b7f75e Merge "Issue #1323 initial commit of interfaces of data access framework" into development
Former-commit-id: b43634a58f [formerly c2631b5ba6] [formerly ff16f82b18 [formerly 68fbcd4c991c6962c27f5aa07b749f0706bfe668]]
Former-commit-id: ff16f82b18
Former-commit-id: 14a139c813
2012-11-13 09:01:43 -06:00
Nate Jensen
14b61ef0f8 Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
Former-commit-id: 254e88a70c [formerly 8a1f3a10a4] [formerly e51d86ce3a [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]
Former-commit-id: e51d86ce3a
Former-commit-id: cf8fd9f731
2012-11-12 17:16:07 -06:00
Lee Venable
eaf7e7c724 Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
Former-commit-id: e62c2fb732 [formerly a576274c3c] [formerly d4276e6474 [formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]]
Former-commit-id: d4276e6474
Former-commit-id: fb4b76b003
2012-11-12 16:58:17 -06:00
Max Schenkelberg
4408af827f Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 30c1802398 [formerly d1099addc6] [formerly 00822a4f39 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]
Former-commit-id: 00822a4f39
Former-commit-id: c4e5092f94
2012-11-12 16:46:21 -06:00
Nate Jensen
cfed9d9664 Issue #1323 initial commit of interfaces of data access framework
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02

Former-commit-id: b24c9eb456 [formerly f255f65b3c] [formerly bf72e29752 [formerly d6b63788ef2af3da474a0d3affcafdddec3690a5]]
Former-commit-id: bf72e29752
Former-commit-id: 78a1185b19
2012-11-12 16:45:33 -06:00
Ben Steffensmeier
d8d2e18a74 Issue #189 modify upgrade script to work with grid resources within bestRes.
Former-commit-id: 4a75a9ef3b [formerly 9c17cd2039] [formerly 8d2a0d4b16 [formerly 784af5833dd3f7514fee15451482cbe7645cef85]]
Former-commit-id: 8d2a0d4b16
Former-commit-id: ff9becd710
2012-11-12 16:37:28 -06:00
Roger Ferrel
3b07bb1ae6 Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.

Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4

Former-commit-id: ab77dfa758 [formerly 66606f88de] [formerly e982c0f43a [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]
Former-commit-id: e982c0f43a
Former-commit-id: de21a3f2ef
2012-11-12 16:27:08 -06:00
Roger Ferrel
01899535e3 Issue #1298 Changes for non-blocking StoreTransmitDlg.
Changes from reviewer's coments.

Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f

Former-commit-id: 13c0fb3f3d [formerly 6445081aa9] [formerly 76109f3bf7 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]
Former-commit-id: 76109f3bf7
Former-commit-id: e7cd99ff0d
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
810e0abd77 Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
Former-commit-id: 65441372df [formerly 7d3f479031] [formerly b5b472dee1 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]
Former-commit-id: b5b472dee1
Former-commit-id: 220f41ec4c
2012-11-12 15:15:49 -06:00
Ron Anderson
3ae270a65d Issue #1325 Update GeoTools for WA4.7
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94

Former-commit-id: 7aaf4db2dc [formerly f709ab812a] [formerly 303994ff1b [formerly 5700f31e4620e1f7b819386aa8762927ec94c2d7]]
Former-commit-id: 303994ff1b
Former-commit-id: 7bf1316e8c
2012-11-12 15:02:08 -06:00
Roger Ferrel
398f71471d Issue #1298 Changes for non-blocking NewToolDialog.
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5

Former-commit-id: 6ec9c1fac4 [formerly 9c9a068908] [formerly f48474fc82 [formerly b24c130aa9c612822dda92a9820912b0cd7bc852]]
Former-commit-id: f48474fc82
Former-commit-id: b11413b7f0
2012-11-12 14:22:02 -06:00
Lee Venable
6ab3480255 Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
Former-commit-id: 72aedbcece [formerly ab62adea95] [formerly 7db247e33a [formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]]
Former-commit-id: 7db247e33a
Former-commit-id: ded0bfb92f
2012-11-12 14:13:06 -06:00
Lee Venable
2b1be166a2 Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
Former-commit-id: d9022d16a6 [formerly 879078484e] [formerly 62c42850e8 [formerly a2a570c55e93b328735e2d2af887eadada92b6ea]]
Former-commit-id: 62c42850e8
Former-commit-id: 4f26da9a9a
2012-11-12 14:09:44 -06:00
Roger Ferrel
88968c54e5 Issue #1298 Changes for non-blocking NewTextProductDialog.
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d

Former-commit-id: ce6d6e277e [formerly 3676829e8f] [formerly ee323d9c60 [formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]]
Former-commit-id: ee323d9c60
Former-commit-id: 73d9e78e92
2012-11-12 13:20:05 -06:00
Matt Nash
dcda4b3fa4 Issue #1324 make times display in 24 hour time
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2

Former-commit-id: 7fa21f5041 [formerly 1480e0abfc] [formerly 0a2f7c9ed2 [formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]]
Former-commit-id: 0a2f7c9ed2
Former-commit-id: d728ffadd0
2012-11-12 12:53:26 -06:00
Roger Ferrel
8490814573 Issue #1298 Changes for non-blocking GridInfoDialog.
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a

Former-commit-id: 1f509c5a54 [formerly 30ef939e3c] [formerly 438731ca2e [formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]]
Former-commit-id: 438731ca2e
Former-commit-id: 195d876753
2012-11-12 12:00:03 -06:00
Roger Ferrel
ecba7301a1 Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
Changes from reviewer's comments.

Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079

Former-commit-id: b60cbeda7a [formerly d89ce26aeb] [formerly d489a7ef9f [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]]
Former-commit-id: d489a7ef9f
Former-commit-id: e01a4ae243
2012-11-12 07:14:15 -06:00
Ben Steffensmeier
5ee5347fc0 Issue #1108 fix the order of arguments for grib 1 parameter mappings
Former-commit-id: 894998b95f [formerly adf0fec9a2] [formerly c4f99aae63 [formerly 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb]]
Former-commit-id: c4f99aae63
Former-commit-id: 87ec259477
2012-11-09 13:36:49 -06:00
Lee Venable
ff21b8d604 Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
Former-commit-id: 125ac804a7 [formerly 109076cb73] [formerly dac9544eed [formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]]
Former-commit-id: dac9544eed
Former-commit-id: a267d9020b
2012-11-08 17:06:54 -06:00
Nate Jensen
38511f0e95 Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
Former-commit-id: 5e718ca85b [formerly a92bfa9393] [formerly cdd6a986e8 [formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]]
Former-commit-id: cdd6a986e8
Former-commit-id: 5e3c076506
2012-11-08 14:50:17 -06:00
Dustin Johnson
eac5bc8197 Issue #1302 Restore jdom.jar, delete net.jcip/.project
Amend:
  Also change the manifest and .classpath for ohd common

Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b

Former-commit-id: db4d728eb7 [formerly 595c421e47] [formerly 2b6e98954e [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]
Former-commit-id: 2b6e98954e
Former-commit-id: 0806be04dd
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
7c93db759c Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF

Former-commit-id: 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]
Former-commit-id: 693090cb36
Former-commit-id: 884c82c4fe
2012-11-08 14:45:36 -06:00
Richard Peter
fa6141c745 Merge "Issue #189 add more comments to grib decoder." into development
Former-commit-id: 7f49c5fe04 [formerly db28cc26aa] [formerly 7077a82458 [formerly 1ad439769c601fe61365f015bc56da0442553be5]]
Former-commit-id: 7077a82458
Former-commit-id: e1852956e2
2012-11-08 14:40:05 -06:00
Ben Steffensmeier
d75b59622a Issue #189 merge ncep changes to unified grid.
Change-Id: I3dac0d3785f093c095f50799890744919edb1891

Former-commit-id: f62cf2713d [formerly e6b0751f5c] [formerly fbed67a208 [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]
Former-commit-id: fbed67a208
Former-commit-id: 7c9341a3a6
2012-11-08 14:34:55 -06:00
Richard Peter
e7151070ee Merge "Issue #189 fix another Unknown Model" into development
Former-commit-id: 10138f3ae8 [formerly 7d8dfb9c01] [formerly 675b1666fd [formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]]
Former-commit-id: 675b1666fd
Former-commit-id: ed90d0aa23
2012-11-08 13:43:37 -06:00
Richard Peter
b8ea93cb95 Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
Former-commit-id: 62e5aff255 [formerly 3450ca3cd3] [formerly 2e9cdbe43e [formerly 6fce68b90116d30cf090db64032322916276136b]]
Former-commit-id: 2e9cdbe43e
Former-commit-id: 4e0c207306
2012-11-08 13:30:27 -06:00
Dustin Johnson
d0867fedef Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c

Former-commit-id: 1220f5167e [formerly ddaa681d8a] [formerly 9784b563cf [formerly 217a17fe79d9156f03597d72e51ab47325b00991]]
Former-commit-id: 9784b563cf
Former-commit-id: 9bb53555a9
2012-11-08 12:00:15 -06:00
Roger Ferrel
553344fb3b Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba

Former-commit-id: 709798659d [formerly e26b14a84d] [formerly 89617dda68 [formerly a2a52b7754d831406e591763930f419def7cb1eb]]
Former-commit-id: 89617dda68
Former-commit-id: 05825bd6f3
2012-11-08 11:19:51 -06:00
Lee Venable
1e61d4bd08 Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
Former-commit-id: 6c0bb76679 [formerly be460c956e] [formerly e791e73a30 [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]]
Former-commit-id: e791e73a30
Former-commit-id: 7b5f085643
2012-11-08 11:11:15 -06:00
Nate Jensen
bdbad943ef Merge "Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time." into development
Former-commit-id: e3487942ac [formerly 96cb1ecc7f] [formerly 01072652dc [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]
Former-commit-id: 01072652dc
Former-commit-id: 375c864d28
2012-11-08 11:08:48 -06:00