Commit graph

7963 commits

Author SHA1 Message Date
Fay.Liang
5e1c980eba Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 08b89e7978 [formerly 5ad29ee888 [formerly 4a76f9bb72ade29ca23a158c0cb2ef038905fd07]]
Former-commit-id: 5ad29ee888
Former-commit-id: adf70ee1c5
2015-03-31 15:02:33 -04:00
Yun.Teng
4726f0dde4 ASM #17206 - Change some parametes that are not rate parameters
Change-Id: I8420e3d3b85e32420c5c91b802f7cdccc035bc2f

Former-commit-id: db554cf9ce [formerly e40e907797 [formerly 23927a6c91076fedc6d53eb5ba2882166814134a]]
Former-commit-id: e40e907797
Former-commit-id: 58e4a5df28
2015-03-30 16:39:34 +01:00
Sean.Webb
4a54cf9006 Merge "ASM #17221 - Updated LDM to 6.12.9" into asm_14.4.1
Former-commit-id: 6679bc9519 [formerly d93c0ec88c [formerly ec7696a5ca44ccdebf86888d27e3fcb151576a61]]
Former-commit-id: d93c0ec88c
Former-commit-id: 0bfb84273c
2015-03-27 08:06:00 -05:00
Sean.Webb
49f1959c15 ASM #17221 - Updated LDM to 6.12.9
Change-Id: Ib01372e3d0365404c9c8c94b951536d671ec5319

Former-commit-id: 723febe25e [formerly 022b59e739 [formerly 3fb2bed462ec0cb2f985b80a4ea02192eac917db]]
Former-commit-id: 022b59e739
Former-commit-id: 35b2495144
2015-03-27 07:58:40 -04:00
Fay.Liang
fb86bbc988 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 53bdc83ba4 [formerly f2e952b71a [formerly dd741e026ef0599738bbbc82579a679b57feeef7]]
Former-commit-id: f2e952b71a
Former-commit-id: af80d5b682
2015-03-19 17:18:52 -04:00
Paul Grell
72b1a9ee64 Merge "Revert "Revert "ASM #17217 - GFE: default to smart formatter types""" into asm_14.4.1
Former-commit-id: f47e4fdcff [formerly 81c34481c1 [formerly 60344f611d90d46fffcf2a05230670b72f303916]]
Former-commit-id: 81c34481c1
Former-commit-id: 2d17527faa
2015-03-19 16:05:49 -05:00
Paul Grell
bdf62a0cdd Revert "Revert "ASM #17217 - GFE: default to smart formatter types""
This reverts commit f4920cc0b9 [formerly f31cdc6925] [formerly 2495ce971f] [formerly b1d84d2964 [formerly 2495ce971f [formerly 111f2d19b08ded3e5ab05406f475da8245af851f]]].

Change-Id: I17493c7867a87fd53814fcc16c7e248a3ee7cddf

Former-commit-id: 3b71d36945 [formerly 07491fe499 [formerly 8c93f552b1af035c1de2f8d9ce71a82c85776afc]]
Former-commit-id: 07491fe499
Former-commit-id: b36de51998
2015-03-19 16:02:22 -05:00
Fay.Liang
15560cc42e Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 475019fb61 [formerly 0284b3b7e9 [formerly e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e]]
Former-commit-id: 0284b3b7e9
Former-commit-id: 228e85dcb9
2015-03-18 15:12:56 -04:00
Fay.Liang
990e8b7d0c Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 6b10ca7348 [formerly 29adda74b3 [formerly 3496ae3b3063b553e7a891d0a62fa489b1bedb9e]]
Former-commit-id: 29adda74b3
Former-commit-id: 6589cd8d6e
2015-03-18 15:09:16 -04:00
Fay.Liang
9b9a3bb1eb Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 1c80edbed0 [formerly 3b9e0864ab [formerly ec7875e9a4bec3752aeb8442fca15e4e4fd02571]]
Former-commit-id: 3b9e0864ab
Former-commit-id: fd502062c5
2015-03-18 15:08:01 -04:00
Fay.Liang
ec294fd11c Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 3233640aa2 [formerly 6f8f2f5398 [formerly 42d435f739134ec29a021415ed96b6c3406fc021]]
Former-commit-id: 6f8f2f5398
Former-commit-id: 8db78cb400
2015-03-18 14:54:46 -04:00
Paul Grell
8f9ec5ac48 Merge "Revert "ASM #17217 - GFE: default to smart formatter types"" into asm_14.4.1
Former-commit-id: 4b1cec4b99 [formerly b28a5d5350 [formerly 4601ad77a9e49efaf34d4563baddcdf61dbd5804]]
Former-commit-id: b28a5d5350
Former-commit-id: d0daa26bdb
2015-03-18 10:44:10 -05:00
Paul Grell
f4920cc0b9 Revert "ASM #17217 - GFE: default to smart formatter types"
This reverts commit 2b5a21a115 [formerly d5ca25bb18] [formerly dc489dabe2] [formerly 70e5e24941 [formerly dc489dabe2 [formerly 81aea3167f21670d7b41eec5458a1f7d36edb36a]]].

As requested by Matt Howard email, reverting to remove from build 14.4.1-19

Change-Id: I8517fa02f22089d1d8433007e85ffa5a38274294

Former-commit-id: b1d84d2964 [formerly 2495ce971f [formerly 111f2d19b08ded3e5ab05406f475da8245af851f]]
Former-commit-id: 2495ce971f
Former-commit-id: f31cdc6925
2015-03-18 09:36:12 -05:00
Rici.Yu
d602aa1fcd ASM #17217 - Add fullStationID entry for table products
Change-Id: I6f68b499ce67a2c6b6bb9dad833b76e3c37d6847

Former-commit-id: 6a7fbec942 [formerly 72af59fcb6 [formerly a987fe4493e4e58618271fffb37a708185ed4139]]
Former-commit-id: 72af59fcb6
Former-commit-id: 26ae2cded5
2015-03-18 10:30:38 -04:00
Chip Gobs
c1733aea0a VLab Issue #6997 MPE DR 17210 Post Analysis: Post Analysis App Failing with 14.3.1-53 Build ; fixes #6997
Former-commit-id: 4600aa594d [formerly 28965a0276 [formerly c8c5c5bce94eba6b1a2f5d5f580f3b6ac8d43a6b]]
Former-commit-id: 28965a0276
Former-commit-id: 78fb9921b2
2015-03-18 10:14:46 -04:00
Chip Gobs
a724187452 VLab Issue #6996 MPE DR 17209 Draw polygon fails on Substitution when field is blank.; fixes #6996
Former-commit-id: c112f01eab [formerly 33a5c2021b [formerly 8b07d138544c4519c4eab52be7b4d6163b8d88ed]]
Former-commit-id: 33a5c2021b
Former-commit-id: 02c817fdfc
2015-03-17 16:28:29 -04:00
Chip Gobs
17422d8932 VLab Issue #6995 MPE DR 17208 PostAnalysis: Scale factor too large fixes #6995
Former-commit-id: 0976737cbb [formerly d09efd7da7 [formerly 8d39d1b1909cfa33dd0f4542258ddacefceef623]]
Former-commit-id: d09efd7da7
Former-commit-id: 96e4320c0d
2015-03-17 13:30:54 -04:00
Sean.Webb
910e5a7477 Merge "ASM #17181 - Updated pqact.conf.template for MRMS, HRRR and ESTOFS" into asm_14.4.1
Former-commit-id: 2f02c89305 [formerly 81c58196f5 [formerly 83f431a646aa28448b8f1cc84ed233eb53062ba8]]
Former-commit-id: 81c58196f5
Former-commit-id: e1d042d9eb
2015-03-17 11:42:37 -05:00
Dave Hladky
8ae1dc30e1 Omaha #3888 found more un-safe nulls
Former-commit-id: 50344c998e [formerly 708517862d [formerly 8034764082e63aee5ed4d79ae79ed911494ca259]]
Former-commit-id: 708517862d
Former-commit-id: db56f95f96
2015-03-17 11:12:59 -05:00
Sean.Webb
3008bd9c75 ASM #17181 - Updated pqact.conf.template for MRMS, HRRR and ESTOFS
Change-Id: Ifd691a453dd201c04a297aa54068a9557b1b03e6

Former-commit-id: 506090817b [formerly ada3710b7e [formerly f3164dc891d77c84d12e745a7ece5bd7eddfa0ee]]
Former-commit-id: ada3710b7e
Former-commit-id: 9918c8e476
2015-03-17 11:31:56 -04:00
Rici.Yu
2b5a21a115 ASM #17217 - GFE: default to smart formatter types
Change-Id: Ib831998a7293e61a5b606d03ef19f47b09f2e0d5

Former-commit-id: 70e5e24941 [formerly dc489dabe2 [formerly 81aea3167f21670d7b41eec5458a1f7d36edb36a]]
Former-commit-id: dc489dabe2
Former-commit-id: d5ca25bb18
2015-03-17 11:26:37 -04:00
Jason Burks
11e66fcd1f VLab Issue #6926 - Moved LMA Menus to be in the lightning Menu; fixes #6926
Updated the based on feddback from Ben.

Change-Id: I2c400f98dc80ee2583818da26466fa9eac37f281

Former-commit-id: 3d3f3a6535 [formerly dc59270db2 [formerly 56d2ffeaf8564c8ea02f52ef35e8aebea2e9f992]]
Former-commit-id: dc59270db2
Former-commit-id: e1e7f27857
2015-03-14 14:36:37 +00:00
Fay.Liang
21e976596e Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 6293139493 [formerly e3f07916ea [formerly 3b4b5c100cc6972beff6e22a609f069f97bdc765]]
Former-commit-id: e3f07916ea
Former-commit-id: 7997322bb4
2015-03-13 16:03:02 -04:00
Fay.Liang
6e55d5d716 Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 9353ac363a [formerly 5e4cde5184 [formerly ce42fe1d1c2ef5f664a522ec30fa91661b4aab3b]]
Former-commit-id: 5e4cde5184
Former-commit-id: 47076ba6b1
2015-03-13 15:59:02 -04:00
Fay.Liang
384f40d63a Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: e4269dfba4 [formerly 7a62d03b55 [formerly ff4a350eca07ea0f158ca0c3082890faa5bda368]]
Former-commit-id: 7a62d03b55
Former-commit-id: 7873b16eac
2015-03-13 15:58:28 -04:00
Richard Peter
3a066de36c Merge "Omaha #4128: Refactor ISC and active table sharing code so that their beans perform cluster failover together." into omaha_14.4.1
Former-commit-id: ca6249346d [formerly 10811f4612 [formerly 99f2b2f693e2e30903399ffc94a7f4d6a84e0fed]]
Former-commit-id: 10811f4612
Former-commit-id: b3add60cee
2015-03-12 20:03:41 -05:00
Richard Peter
8cf98e0383 Merge "Omaha #4269 fix pypies logging process that was broken due to python 2.7.4 'fix' of http://bugs.python.org/issue14436" into omaha_14.4.1
Former-commit-id: 5eec59c6bf [formerly 41d6c509e7 [formerly f1b6aaa632e3b94157d27ba311fec435acd61fbe]]
Former-commit-id: 41d6c509e7
Former-commit-id: ac3ccfd882
2015-03-12 14:26:46 -05:00
David Gillingham
f70cefd6b7 Omaha #4128: Refactor ISC and active table sharing code so that their beans perform cluster failover together.
Change-Id: Ib97d20bdd26b413648727101da26fee8449cb7ba

Former-commit-id: e713928f7c [formerly cc99fbdb0a [formerly d242c9cc22d53dca873e62787f6ab3234dd2b7df]]
Former-commit-id: cc99fbdb0a
Former-commit-id: e6512aa181
2015-03-12 10:17:01 -05:00
Ron Anderson
99da4d09a4 Omaha #4129 Fix server selection logic used by requestAT, requestTCV, and sendTCV
Change-Id: I1b31a05844e8a760d01bac57e2897bed28df198c

Former-commit-id: bf2ff2d80f [formerly 9200772cff [formerly fb32cc53c476d64368e1a9b607e8b2a8e21dfb2c]]
Former-commit-id: 9200772cff
Former-commit-id: 8bc5f56bce
2015-03-12 09:47:36 -05:00
Nate Jensen
b44803863d Omaha #4269 fix pypies logging process that was broken due to python
2.7.4 'fix' of http://bugs.python.org/issue14436

Change-Id: I496c1612eca0450f925ae0cd78dca9f28cd89d79

Former-commit-id: 8f19a358a8 [formerly 20eb88b23a [formerly dae442d1f32fa5f5c9547ab1932134e3865557d1]]
Former-commit-id: 20eb88b23a
Former-commit-id: 191681a413
2015-03-11 16:29:17 -05:00
David Lovely
54bfeb8401 Omaha #4221 Removed obsolete Visual Studio files.
Change-Id: Ibcea4659acc97aade2b6dbe8b9ed39dfd9dec6f0

Former-commit-id: 40fdfa4495 [formerly cf70101647 [formerly 23596cab4104291e8beec8e344fbc60a923f4800]]
Former-commit-id: cf70101647
Former-commit-id: aed4eba3bb
2015-03-11 14:43:47 -05:00
Fay.Liang
2d47e9b612 Merge tag 'OB_14.3.2-21m' into master_14.4.1
14.3.2-21m


Former-commit-id: 70714494f9 [formerly 8b2164cfa1 [formerly f08ea9cd7acadd1f8f1bb2eedf7ce39894c3f39e]]
Former-commit-id: 8b2164cfa1
Former-commit-id: 17934b3a66
2015-03-11 14:32:22 -04:00
Nate Jensen
a47e9b72ac Omaha #4238 null safety check if feed view temporarily exists in other perspectives
after logging out

Change-Id: I9bdfa86a1ae2d587cf3ad4487d0c6eae15f1ff25

Former-commit-id: 808ae0398b [formerly e078881789 [formerly b915adf57c64e5b0cf5f856436c9a1f01098a897]]
Former-commit-id: e078881789
Former-commit-id: 7e899a1c08
2015-03-10 18:38:41 -05:00
Fay.Liang
67497cc1e9 Merge branch 'master_14.3.1.1' into master_14.3.2
Former-commit-id: d06537cf12 [formerly 4be968c00b [formerly 450fdfceca0e7f3745a8dcbffe3d7740ff1aee64]]
Former-commit-id: 4be968c00b
Former-commit-id: 5b9a4ddbdf
2015-03-10 14:52:49 -04:00
Fay.Liang
5bc1a43ccb Merge branch 'asm_14.3.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1.1
Former-commit-id: 03a84c325e [formerly 1d1a546fe3 [formerly 93ab4740381b75ba8bf713117a417febdacb6b33]]
Former-commit-id: 1d1a546fe3
Former-commit-id: 73a2b1187e
2015-03-10 13:53:51 -04:00
Michael Gamazaychikov
56d6e13307 ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
Change-Id: I7b0f6b3974e8a8e4072fa530dce7443a9d85244a

Former-commit-id: 12304947c6 [formerly 24d10369ab [formerly a437417c6a07fc069e194cd08d515c6984d15616]]
Former-commit-id: 24d10369ab
Former-commit-id: 006d437d17
2015-03-10 13:18:09 -04:00
Sean.Webb
29ccb6965f ASM #17227 - Fixed total lightning pattern
Change-Id: I889a405685e1b51cb115d40ada425f80947920d2

Former-commit-id: 4ef6100cf8 [formerly 20ea80a89a [formerly 4349757b615d3963d3201c1045fa7599c09acdf8]]
Former-commit-id: 20ea80a89a
Former-commit-id: 304ec5502d
2015-03-10 12:43:15 -04:00
Tiffany Meyer
8ca580f756 VLab Issue #6834 - MRMS Sub-gridding velocity patch; fixes #6834
Former-commit-id: df86b25aa9 [formerly 62b8b3a30c [formerly 639a67e0ff96c5ea23613a75071017ecf86085c8]]
Former-commit-id: 62b8b3a30c
Former-commit-id: 19f2e097ce
2015-03-10 09:42:14 -05:00
Dave Hladky
1e8abe2bd0 Omaha #3888 fixed pop up for thesholds and fog monitor safety.
Former-commit-id: d01e7774b5 [formerly 344ed156e4 [formerly b1c25aa439095ef52ad228662bbe1d38aae5d555]]
Former-commit-id: 344ed156e4
Former-commit-id: 168ea904ea
2015-03-09 15:51:45 -05:00
Fay.Liang
1138f48ee9 Merge tag 'OB_14.3.2-19m' into master_14.4.1
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 0e475cb704 [formerly 059eb032b1 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]]
Former-commit-id: 059eb032b1
Former-commit-id: a9945f1981
2015-03-09 16:11:13 -04:00
Steve Harris
701501ad9e Merge tag 'OB_14.4.1-16m' into omaha_14.4.1
14.4.1-16m


Former-commit-id: 62527097b4 [formerly b5f51e446c [formerly ed67f8932f910a858b32b503fc8009e39dac03ab]]
Former-commit-id: b5f51e446c
Former-commit-id: 651a86512c
2015-03-09 11:39:50 -05:00
David Friedman
49a653f357 ASM #17190 - Counties being listed twice in Zone based products with extra county entries in shapefile
Change-Id: Ie3cb35803e7ef08a4147d85c9a7f28b0476ce5a2

Former-commit-id: 3c45c2d158 [formerly cfb3788972 [formerly 6d8bd3315f48d188507a76092a950511a75c142c]]
Former-commit-id: cfb3788972
Former-commit-id: dc25e9d8dd
2015-03-09 14:23:35 +00:00
Evan Polster
3cb60bb1e7 VLab Issue #6773; Fixed problem where LAPS config file wasn't being persisted to the server; fixes #6773
Change-Id: I133973de6a129709a151313f090066b09bc4222e

Former-commit-id: 6b7bec9ce8 [formerly 0b5bb1291e [formerly 948baed3df402f659cf9b80fd10a3bc3d9788036]]
Former-commit-id: 0b5bb1291e
Former-commit-id: c895a60ff5
2015-03-06 23:07:47 +00:00
Ben Steffensmeier
c440725187 Omaha #4233 Remove cloud flash and pulse menu items from GLD and NLDN menus.
Change-Id: I73f67925b0f14fd1eb062ea8f157dc7487f0b030

Former-commit-id: 989acdf74b [formerly 3ec9b5dac6 [formerly 0e31a9da60cfa9d99a8aae21f3bf2f403b838312]]
Former-commit-id: 3ec9b5dac6
Former-commit-id: b47c266ed0
2015-03-05 16:20:44 -06:00
Ben Steffensmeier
138f33600d Omaha #4209 Create upgrade script for satellite spatial column data types.
Former-commit-id: 9ad33b30e9 [formerly 9c4d7d1365 [formerly 4b2f7af0f11140f0648ebfdfd8891ee839637ec8]]
Former-commit-id: 9c4d7d1365
Former-commit-id: fb2d5ace62
2015-03-05 13:12:36 -06:00
Richard Peter
ada90cea94 Merge "Omaha #4161 fixed keystoreUtil script, Fixed goessounding race condition at startup, Fixed max-web server threags Jetty 8.1.15 bug" into omaha_14.4.1
Former-commit-id: fcd83f4f64 [formerly 4934064003 [formerly 12f2bf58f6e9db21ab17723a1597fb3f1b3d97a5]]
Former-commit-id: 4934064003
Former-commit-id: bdcf2bbc57
2015-03-05 12:15:17 -06:00
Shawn.Hooper
b332c872ed ASM #17178 - Update TCMWindTool to remove option for background Wind field
Change-Id: Ia299900784b9fe05a68ca25a74528abdc68a3f1f

Former-commit-id: 54d5553a93 [formerly c0b675033a [formerly bc4ec070e81298f7ed7312692a7f43cbd2d854ec]]
Former-commit-id: c0b675033a
Former-commit-id: a9a2bddc61
2015-03-05 12:58:44 -05:00
Ron Anderson
6dd6433471 Merge "Omaha #4128: Fix NullPointerException in FetchActiveTableSrv.preStop()." into omaha_14.4.1
Former-commit-id: 8a51d088bc [formerly d2d0d0f573 [formerly 4100c8f8d3f05a47676f2a5a7ee0bcf4d0151733]]
Former-commit-id: d2d0d0f573
Former-commit-id: 43c476b825
2015-03-05 11:52:13 -06:00
Fay.Liang
67165a8923 Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
Former-commit-id: 51cce67ca8 [formerly 97d25e8c8b [formerly cbed951a6854af1afe4e4e1d14bedfda1534b21f]]
Former-commit-id: 97d25e8c8b
Former-commit-id: 8b08da8fa1
2015-03-05 12:48:18 -05:00
David Gillingham
bb3928c0f5 Omaha #4128: Fix NullPointerException in FetchActiveTableSrv.preStop().
Change-Id: I52f7181d2e6585f4e1b84e949212324d308529cc

Former-commit-id: 154e56e186 [formerly 3fc30a2584 [formerly 92b8782bb0c874e78e00d848c71c8140ff71e6ac]]
Former-commit-id: 3fc30a2584
Former-commit-id: 335c923d71
2015-03-05 10:08:14 -06:00