Commit graph

3675 commits

Author SHA1 Message Date
David Gillingham
7fe1a980ba Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser.
Change-Id: I17ebbd913a17e158898a27b83e342f08ade610d6

Former-commit-id: c01694607f [formerly b13f8c7794 [formerly 09d7c45466f2fad8df8142bcbf0ded2e3757ffcb]]
Former-commit-id: b13f8c7794
Former-commit-id: 2e3b98f02f
2015-04-09 13:26:52 -05:00
Ron Anderson
4c18b347c3 Merge "Omaha #4367: Revert baseline time constraints for WindGust back to 1 hr." into omaha_14.4.1
Former-commit-id: b191e48681 [formerly 7ec6496a0c [formerly bc410201332feaced47f12645528fcb36c09adc6]]
Former-commit-id: 7ec6496a0c
Former-commit-id: be4eba46a3
2015-04-06 09:39:38 -05:00
David Gillingham
3a619c1753 Omaha #4366: Fix gfecron user id check in runManualNWPS_OutsideAWIPS.sh.
Change-Id: I1738406430766fa01de31a40f8e66b0633ace74f

Former-commit-id: 9db7098bb2 [formerly af9ed691fc [formerly 3ee51663579734163b54b4997e8a3cb3e0727025]]
Former-commit-id: af9ed691fc
Former-commit-id: 58f8256708
2015-04-03 12:06:00 -05:00
David Gillingham
d29e51e8e4 Omaha #4367: Revert baseline time constraints for WindGust back to 1 hr.
Change-Id: I8ed3b075b4097d37926d67c616a451fee38b4358

Former-commit-id: 2f5d67f093 [formerly ccfda63e1d [formerly b6660c446ee92a6bf82b935920ee1c6def7f7699]]
Former-commit-id: ccfda63e1d
Former-commit-id: 6c6d9f5a3e
2015-04-03 12:00:45 -05:00
Richard Peter
13ce71adb1 Merge "Omaha #3722 - Update taf datauri fields to not be null in db." into omaha_14.4.1
Former-commit-id: 99dd31ce70 [formerly 0ef1e980bd [formerly e9b25a22497335c1580980c106156cf5779a4fe3]]
Former-commit-id: 0ef1e980bd
Former-commit-id: cdf85b8346
2015-04-02 13:42:22 -05:00
Richard Peter
5641be4136 Omaha #3722 - Update taf datauri fields to not be null in db.
Change-Id: I47aef4a6775e91a0d3b749252cf3726e38d6308e

Former-commit-id: 4cd1e48fc9 [formerly f8425ab814 [formerly 073e73dd86aee3c6d1731def225aad038cf877de]]
Former-commit-id: f8425ab814
Former-commit-id: f036b4db56
2015-04-02 13:41:00 -05:00
Ron Anderson
d1bdf50fdd Omaha #4357 Comment out all product IDs by default they will be enabled at a later date.
Change-Id: I4e4683e0d5468e77b67ceee4de859129cfca0bec

Former-commit-id: 588bc104a3 [formerly c4b4343573 [formerly 760b479895474dbd237f9b6d72913cfc4d937b90]]
Former-commit-id: c4b4343573
Former-commit-id: 30a81243f0
2015-04-01 16:55:05 -05:00
Steve Harris
46b86ab052 Merge tag 'OB_14.4.1-20m' into omaha_14.4.1
14.4.1-20m


Former-commit-id: f099adad75 [formerly 68f4b3c18f [formerly dc7c935e809764604aa7f773b7123630dd818dd5]]
Former-commit-id: 68f4b3c18f
Former-commit-id: d320c52c35
2015-03-26 08:26:55 -05:00
David Gillingham
bbd3295953 Omaha #4308: Ensure service backup handles mixedCaseProductIds.txt
Change-Id: Ie071c48ba4331af4d12681ec65f90cae4310abd0

Former-commit-id: 6b7188f71d [formerly af4d82693a [formerly c6a96c73e30394b4ee8b29b4dec1deb8a25ee72f]]
Former-commit-id: af4d82693a
Former-commit-id: 7e98907a83
2015-03-23 10:07:22 -05: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
Steve Harris
fdf751fa90 Merge tag 'OB_14.4.1-18m' into omaha_14.4.1
14.4.1_18m

 Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java


Former-commit-id: 9b749e134d [formerly 19f99823a6 [formerly 390c7ec5c261717f6e0b2053761e12e1fcb68215]]
Former-commit-id: 19f99823a6
Former-commit-id: bda107f32a
2015-03-18 13:09:03 -05: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
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
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
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
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
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
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
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
Fay.Liang
559106e551 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: bafd1eb2db [formerly 2cdb454dc0 [formerly c127d4bd2f42a22d91e9a0517a6d0e8b17198d6b]]
Former-commit-id: 2cdb454dc0
Former-commit-id: cc627997a8
2015-03-05 10:41:04 -05:00
Fay.Liang
654d618fc5 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 211d9bb8eb [formerly aa2fa72260 [formerly 10b981ac5353585985f450b849006bd6514fe057]]
Former-commit-id: aa2fa72260
Former-commit-id: 7398f8fb7b
2015-03-05 10:39:44 -05:00
Ron Anderson
6fcf5636ab Omaha #4129 Fix exception handling on subprocess calls in IrtServer.py
Change-Id: Id0923f0ee4ae61f45df6f336fc856e8d27897990

Former-commit-id: 893de08048 [formerly 0f7f415204 [formerly 30bfaf9432481328ed9d23ef56568a857cf775c7]]
Former-commit-id: 0f7f415204
Former-commit-id: ea5dd120e2
2015-03-05 08:56:48 -06:00
Ron Anderson
1d5a9b4cd8 Merge "Omaha #4129 Log active table changes from ingestAT" into omaha_14.4.1
Former-commit-id: e08d469768 [formerly a6167718b2 [formerly eaecbaa0b66153b43bfe59f96c43a1876b9e235f]]
Former-commit-id: a6167718b2
Former-commit-id: e315d9811d
2015-03-04 16:06:41 -06:00
Ron Anderson
c18c4dbbad Omaha #4129 Log active table changes from ingestAT
Change-Id: I19dee195785363bba0008419fbf156b2d74cf6dc

Former-commit-id: 1b2258ed00 [formerly 3468d2ee60 [formerly 009e56509930c8fdf2eacd250903260a13a6f3ca]]
Former-commit-id: 3468d2ee60
Former-commit-id: f299aab920
2015-03-04 15:37:22 -06:00
Dave Hladky
ada3a1c3f1 Omaha #4161 fixed keystoreUtil script, Fixed goessounding race condition at startup, Fixed max-web server threags Jetty 8.1.15 bug
Former-commit-id: 63322de483 [formerly e958125848 [formerly d734262db63974de8bb846df63942596d06b24c1]]
Former-commit-id: e958125848
Former-commit-id: 44b9d9691d
2015-03-04 14:11:51 -06:00
Shawn.Hooper
4261f6843f ASM #16946 - Update typo from dateFile to dataFile
Change-Id: I1e18426806b0a6e1cb2ef1bbf5c003e5a8a8e1c2

Former-commit-id: 08f7a7ef1c [formerly f3f48cf71f [formerly 13fbcbd0a2cb70228a47d63839640c7612caaa2a]]
Former-commit-id: f3f48cf71f
Former-commit-id: e30935d13d
2015-03-04 14:07:01 -05:00
David Gillingham
1d45c1f80f Omaha #4128: Ensure active table sharing is configured before enabling it.
Change-Id: Ib42a251f5d9c134da7ba484582ce60d653a06937

Former-commit-id: 46e371f7e6 [formerly 07805e808c [formerly 3ebb60db47fc74a77eea56ae7738b5f7b405fb19]]
Former-commit-id: 07805e808c
Former-commit-id: 0ced2f9067
2015-03-03 16:46:39 -06:00
Ron Anderson
06b572187d Merge "Omaha #4128: Move FetchActiveTableSrv to edex.gfe plugin, fix cluster failover of service." into omaha_14.4.1
Former-commit-id: c50e75314f [formerly 9648dbc550 [formerly 3ccb7a96f716bf5cd829a8f34a93dbc6744f3d1b]]
Former-commit-id: 9648dbc550
Former-commit-id: 5fe860eba4
2015-03-03 15:59:42 -06:00
Fay.Liang
065ce3318a Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 1ed5d493fa [formerly f00b3d3156 [formerly c91a37257cd2882047e79200f624acc1e0312cba]]
Former-commit-id: f00b3d3156
Former-commit-id: 07c0347c3e
2015-03-03 14:44:31 -05:00
Fay.Liang
548851cad0 Merge branch 'master_14.3.1.1' into master_14.3.2
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 9a4751b60e [formerly 8bfe8fb65f [formerly 5aa2c444583d03b442768a8e9ea462877a25bb8d]]
Former-commit-id: 8bfe8fb65f
Former-commit-id: 97be252793
2015-03-03 14:26:22 -05:00
Michael Gamazaychikov
140ceb8df5 ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
Change-Id: I5772661758a26c47019c3939ceff73ca0eb6f50e

Former-commit-id: 9db91abd8a [formerly 6897cfd7b9 [formerly ab0f7f0f627ab3926a219940f1267dc460e74e14]]
Former-commit-id: 6897cfd7b9
Former-commit-id: b6fab0df30
2015-03-03 09:38:34 -05:00
cmadmin
faba4fdb38 Merge "Omaha #3299 - Remove fits plugin from awips2-edex-cots feature" into omaha_14.4.1
Former-commit-id: fc5e9ad8e2 [formerly 58cb5d45be [formerly c0686acd33a35fdbca17dcc0255826a0e10c74d8]]
Former-commit-id: 58cb5d45be
Former-commit-id: 828b308922
2015-03-02 14:12:07 -06:00
Greg Armendariz
b0dcdf688c Omaha #3299 - Remove fits plugin from awips2-edex-cots feature
Former-commit-id: bd3a7e13ac [formerly 07c51b71bf [formerly 4ddbeaba11bab77ece13ee46e89d34f141619701]]
Former-commit-id: 07c51b71bf
Former-commit-id: 8ea0c0d1b5
2015-03-02 13:11:44 -06:00
Joshua Watson
3d500422e1 VLab Issue #6684 - Fixed parameter abbrev in derived parameter CONVP2hr.xml and fixed grib table entry in grib/tables/7/14/4.2.0.19.table; fixes #6684
Change-Id: Ibcfe705b56cc4112da732c46eb17d52f9a4a6df7

Former-commit-id: ac92410d39 [formerly 7fc4a6f2ae [formerly 5a0b0653e28f31a080eec2123386359691c4b1fd]]
Former-commit-id: 7fc4a6f2ae
Former-commit-id: 845e1557e5
2015-03-02 12:10:07 -05:00
Steven Harris
342a165c96 Merge tag 'OB_14.4.1-14m' into omaha_14.4.1
14.4.1-14


Former-commit-id: 318afb44dc [formerly 84804cf7c6 [formerly bf4f8eca3dfd48957a84a8594ea6aa02b77dc700]]
Former-commit-id: 84804cf7c6
Former-commit-id: 4ae60f470a
2015-03-02 09:25:54 -06:00
Fay.Liang
0a13ba3a8c 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: 0d3078ace9 [formerly 185feac0e0 [formerly f07eab6e1ccf6737cb90dc9af5ac247807124158]]
Former-commit-id: 185feac0e0
Former-commit-id: 267928c10b
2015-03-02 09:29:39 -05:00
Qinglu.Lin
9ee1b4a0a2 ASM #17169: WarnGen Templates: IBW marine CTA and impact updates
Change-Id: I59e000340b6a82dc439128f3ad6963476b669344

Former-commit-id: dcef82c4d6 [formerly cf66bb11f3 [formerly 441be68f8726618225b0c7a5077443b8a7815d99]]
Former-commit-id: cf66bb11f3
Former-commit-id: 5258c8f8b7
2015-02-27 16:10:22 -05:00
Greg Armendariz
214513f99b Omaha #3299 - Remove features
Change-Id: Icb1583b2f0a7bd165034714826c5c43ff7bf88b7

Former-commit-id: d7fad73fcc [formerly dc4cc9e7c7 [formerly 504cf2eb9598364f7f2717dafe93f54bd8f2187d]]
Former-commit-id: dc4cc9e7c7
Former-commit-id: dbb07175dc
2015-02-27 09:37:25 -06:00
David Gillingham
fde97e61b3 Omaha #4128: Move FetchActiveTableSrv to edex.gfe plugin, fix cluster failover of service.
Change-Id: I99132eb075f3ccf4dd8b679d61c992e7029e1a31

Former-commit-id: 63139c2f38 [formerly d7c0000508 [formerly 5d962bf6cf7a3e40ee152bc98817daf116633f60]]
Former-commit-id: d7c0000508
Former-commit-id: cdb695e517
2015-02-26 15:57:47 -06:00
Greg Armendariz
82842a4717 Omaha #3299 - Add back correct jars, update deploy-install to search for plugins in optionaldirectories
Change-Id: I5aebad06117f7072d322b8d7cbfe4a14acc2fdf8

Former-commit-id: 9d95e79cd7 [formerly 7539d84bba [formerly 3a09dc91fbeb7db16a99116ad2582932e3fd6e58]]
Former-commit-id: 7539d84bba
Former-commit-id: 465da92660
2015-02-26 14:03:17 -06:00
Nate Jensen
bea946605f Merge "Omaha #3299 - Updated deploy-install to find features" into omaha_14.4.1
Former-commit-id: ad82097a9e [formerly 601df7e202 [formerly 338968eebfe41680949dc39b60696e2fdc9f96c1]]
Former-commit-id: 601df7e202
Former-commit-id: 5d8b9f55e6
2015-02-26 09:28:55 -06:00
Greg Armendariz
fe5cf3f8e6 Omaha #3299 - Updated deploy-install to find features
Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2

Former-commit-id: 1a3ca4f8df [formerly 6a5463ab87 [formerly a25d39959ccdc41ab99e0eaf4ad87559adfcb362]]
Former-commit-id: 6a5463ab87
Former-commit-id: 2fd4ace0a2
2015-02-25 09:51:49 -06:00
Dave Hladky
de74770e0b Omaha #3220 Verified config file is read when an update occurs.
Former-commit-id: 15f3234242 [formerly c7de9128a2 [formerly 9ad78f067456eb04367a9d3aca58d9f5ee330c41]]
Former-commit-id: c7de9128a2
Former-commit-id: 99cc0e8764
2015-02-24 16:20:56 -06:00