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

7544 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zhidong.Hao
ef8b20e25e ASM #633 GFE: SmartScript method loadParm() exception handler broken 
Change-Id: Ic7bef317b06dd695889bcc72cceee4ef41b147bc

Former-commit-id: 0580bc3c94 [formerly a7019b2c0c] [formerly 1f19ce8a20 [formerly 12ed9574fa7f62d200d50419f88b8ab773930e7a]]
Former-commit-id: 1f19ce8a20
Former-commit-id: 20a71df198
 2014-11-26 13:52:01 -05:00
steve.naples
ffb601d560 ASM #16889 - Daily QC does not display SNOTEL data. 
Change-Id: I42035d5d4d856a395400a1be1d0c6a24bc64b0d8

Former-commit-id: 74aa7ae98b [formerly ec656123f2] [formerly a0face5b02 [formerly 01735909fffdc9b5ef14ed072253eed6deaecad9]]
Former-commit-id: a0face5b02
Former-commit-id: 5845c1d382
 2014-11-26 18:24:53 +00:00
Richard Peter
394674436a Merge "Omaha #3870 Updated table to include missing elements." into omaha_14.4.1 
Former-commit-id: 1a88edfa4f [formerly 6d046826dc] [formerly 6759ffa76c [formerly e7056504ae5758e2b4abbdef9cec7b2467d49add]]
Former-commit-id: 6759ffa76c
Former-commit-id: 25407d6fdd
 2014-11-26 10:13:40 -06:00
Roger Ferrel
a170a1318d Omaha #3870 Updated table to include missing elements. 
Former-commit-id: 0ae4219196 [formerly c4cf624d04] [formerly fedc4aae8a [formerly 7569e4f2b962d22453b7414ea882f2383cec9ade]]
Former-commit-id: fedc4aae8a
Former-commit-id: e3d4250f65
 2014-11-25 14:31:05 -06:00
Roger Ferrel
2d763dc64a Omaha #3866 Configuration files for GFS20KM for product and volume browsers. 
Former-commit-id: da25f4588d [formerly 9b986c7cf8] [formerly 0df840602e [formerly 56833ab1b84e50c6ca4150d3c90501448233313b]]
Former-commit-id: 0df840602e
Former-commit-id: 4ba718da37
 2014-11-25 10:01:30 -06:00
Bryan Kowal
4a106ddab1 Omaha #3695 - PostgreSQL will always provide version 3.3.6 of geos. Version 3.3.6 
of geos is the only version that our current version of postgis will see. Even
when geos 3.3.7 and 3.3.6 are on the path during compilation, postgis will still
be compiled with a dynamic link to both versions of the library even though
there was not a 3.3.6 available during compilation.


Former-commit-id: b1bf38f922 [formerly eb52d1b333] [formerly 700eefe0ee [formerly 2dafcfc4e0350654c30eb077329711259bf12d1f]]
Former-commit-id: 700eefe0ee
Former-commit-id: d40302bf3b
 2014-11-24 16:20:34 -06:00
Nate Jensen
e2f2a73ae3 Merge "Issue #3026 - Fix for HPE displays is volume browser" into omaha_14.3.1 
Former-commit-id: e4da2244f9 [formerly b46b4b51a8] [formerly 63c505f357 [formerly 1cf731bc43346810f1976650ad509ee538cf3067]]
Former-commit-id: 63c505f357
Former-commit-id: 102d0e7a29
 2014-11-21 15:46:16 -06:00
Nate Jensen
7cea027028 Merge "Omaha #3709 Collaboration chat colors for PeerToPeerView" into omaha_14.4.1 
Former-commit-id: 42caba5dc9 [formerly 737fa5c716] [formerly 2f4b6deaee [formerly 68880c0426392a15fc1d05a423c381856b032634]]
Former-commit-id: 2f4b6deaee
Former-commit-id: deaabfbac8
 2014-11-21 14:59:08 -06:00
Mike Duff
04222b8e43 Issue #3026 - Fix for HPE displays is volume browser 
Change-Id: I1ef2766e9bf74e7ad82cc36cd4e4a35659aacf39

Former-commit-id: 3ab236aca3 [formerly 67f3b00beb] [formerly c1bea3b41f [formerly a375e64e7ee3276be47b26f4386e7bc6491bc740]]
Former-commit-id: c1bea3b41f
Former-commit-id: 3f0f42a7df
 2014-11-21 13:56:46 -06:00
Mark Peters
a800e0eb0b Omaha #3709 Collaboration chat colors for PeerToPeerView 
Change-Id: I78a5f13caa685c993a28293f6a110fd52b2b7b08

Former-commit-id: 10179bb1f4 [formerly 0332e4e693] [formerly 3d43e87374 [formerly 341b54d6d23f08499345b8972a77acc9e2ca8c8b]]
Former-commit-id: 3d43e87374
Former-commit-id: 6ff9cdd45b
 2014-11-21 12:57:08 -06:00
Fay.Liang
dca4f4479a Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: 14f518ff86 [formerly 744fc3f9d7] [formerly d4845b8b03 [formerly 21e36577299266c03c8d860afa844cae29538b0f]]
Former-commit-id: d4845b8b03
Former-commit-id: f53a91518c
 2014-11-21 13:48:43 -05:00
Ying-Lian.Shi
cfb854914d ASM #98 GFE: ifpnetCDF no longer gives an error code in some cases 
Change-Id: I74e78b7d64fef4538ded4ed0e4e4b13d1950363a

Former-commit-id: 261177ee7c [formerly a0bfede4e0] [formerly 7c99c63441 [formerly 98c99131445b4b9fa727a9ea09fc4df8906aa90b]]
Former-commit-id: 7c99c63441
Former-commit-id: 0a2c6b0f66
 2014-11-21 15:38:25 +00:00
Ying-Lian.Shi
bbc3892a5e ASM #646 GFE: Event end time cannot be set beyond 96 hours on the MakeHazard GUI 
Change-Id: I83e1701be2417e7ee6c0223e192cb9e0731c761b

Former-commit-id: d5036028d9 [formerly 89fca6f761] [formerly 58958ef423 [formerly 6341d72f458c62756f27c851f0db654ab901b7af]]
Former-commit-id: 58958ef423
Former-commit-id: f55dd98ae8
 2014-11-21 14:32:17 +00:00
Fay.Liang
6ea952ccc6 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: 4205453aa9 [formerly 00a63ad80c] [formerly 5de19378ee [formerly 9daaa34c341929f784628782c98d5edcf9944ed2]]
Former-commit-id: 5de19378ee
Former-commit-id: 5329eea699
 2014-11-21 09:31:58 -05:00
Ana Rivera
9183d5c2bc VLab Issue #5408 - TCV Update: TCVDictionary.py (O&M RM14468); fixes #5408 
Change-Id: If7b45b6415653efe11485956755cd7aaeb49356b

Former-commit-id: 144d7201a3 [formerly 250ba9f14c] [formerly 4a4e53cab1 [formerly 82e3e8e69e7ebe738a84603c6f901d619004fe8a]]
Former-commit-id: 4a4e53cab1
Former-commit-id: 1d3efeb9d9
 2014-11-21 13:19:59 +00:00
Mark Peters
cd91095ec7 Omaha #3768 Add localization to build.properties in uf.viz.aviation.advisory 
Change-Id: I96afa121509b7e70fbb0113843924737330366a5

Former-commit-id: 34e3301c73 [formerly 5bff597f00] [formerly 55e6a1d8a2 [formerly 42faaabd5fb640add67bd1c68898e87af670db3e]]
Former-commit-id: 55e6a1d8a2
Former-commit-id: 3f2ce8f8de
 2014-11-20 17:50:52 -06:00
Ron Anderson
898e4993b2 VLab Issue #4953 Build fix and another cleanup item. 
Change-Id: I5d92df3f452259c93784cd19e75cc7efd8e04dc4

Former-commit-id: cd44c42d18 [formerly 9485f33476] [formerly 8e4f2100cb [formerly 7a33861e7ac4475855778f50e0a5fca5227e5f97]]
Former-commit-id: 8e4f2100cb
Former-commit-id: 5181e9ab47
 2014-11-20 17:07:58 -06:00
Shawn Hooper
3661050896 VLab Issue #5395 - Update gfeConfig.py based on Pablo's email 
Change-Id: I100a8d2bb79092bca2157bba018566a650c55f4a

Former-commit-id: 5773b07a29 [formerly 31d8337c56] [formerly 8376f3fce5 [formerly c5278c1a2d81d995ae9df252c461123bcc870320]]
Former-commit-id: 8376f3fce5
Former-commit-id: d7d73c4635
 2014-11-20 17:11:42 -05:00
Fay.Liang
acdabae0ab Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: 069db81e14 [formerly 99263f79e1] [formerly 5bd22b74c6 [formerly 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9]]
Former-commit-id: 5bd22b74c6
Former-commit-id: 7aa08b8ba4
 2014-11-20 13:32:25 -05:00
Roger Ferrel
1a39fc8b9c Issue #3439 Changed id=gfs90 to id=gfs to avoid confusion in these xml files. 
Change-Id: I55b44a25196e9dcbc0a5e1417da1c39e5b978f3e

Former-commit-id: 4bcfb3ccaf [formerly 4d06812d30] [formerly 71db8afbaa [formerly a9ce685c99dbdc1442f022cda7af09af5bdabf87]]
Former-commit-id: 71db8afbaa
Former-commit-id: a188c5443b
 2014-11-20 12:25:00 -06:00
Shawn Hooper
2f954d65be VLab Issue #5395 - Build fixes and gfeConfig.py update 
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: fd57e5334c [formerly b7369c5eef] [formerly cf72b5753d [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]
Former-commit-id: cf72b5753d
Former-commit-id: 330eae9f9e
 2014-11-20 13:12:16 -05:00
Ana Rivera
2b181f5204 VLab Issue #5388 - HTI Update: replace 'MFL' references with SITE in HTI.xml (O&M RM16791); fixes #5388 
Change-Id: I69ead4e0ed1103ca21728e46fa654ebaa85258a0

Former-commit-id: ed6514067f [formerly 29ff0e472b] [formerly c8a750b063 [formerly 27d2c6133b5563614b88fa03e3e706c6da2070a4]]
Former-commit-id: c8a750b063
Former-commit-id: efdfe7dc36
 2014-11-20 13:57:19 +00:00
Fay.Liang
a75d5d336d Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: a32ec39df2 [formerly 29561d5324] [formerly 45b80432d6 [formerly 28c3dbd91c1e89ffffd19afa811a08e228a995dd]]
Former-commit-id: 45b80432d6
Former-commit-id: de4ab82df7
 2014-11-19 22:07:54 -05:00
Ana Rivera
168fe90936 Merge "VLab Issue #4953 Added support for managing JSON files in practice mode." into tcv_14.3.2 
Former-commit-id: 419dc9ff10 [formerly 7dacc070d2] [formerly 40855f4ebd [formerly a0946643e3dab3f54c9d1d7a48dbb06b82207b55]]
Former-commit-id: 40855f4ebd
Former-commit-id: ae6d3b9e33
 2014-11-19 16:27:03 -05:00
Ana Rivera
44daef5ca2 Merge "VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382" into tcv_14.3.2 
Former-commit-id: bdd114073a [formerly 3b802999cb] [formerly 0879a27742 [formerly 78fc066cba9d5df0707d66a47c31ffbc05528214]]
Former-commit-id: 0879a27742
Former-commit-id: f92c661391
 2014-11-19 16:04:30 -05:00
Ana Rivera
28033b25f7 VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382 
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df

Former-commit-id: befcdc96f9 [formerly 2c388bd379] [formerly af00fd8a98 [formerly 7d9cf7bfb3f513314608b6269f437061fc36d090]]
Former-commit-id: af00fd8a98
Former-commit-id: dd4a60d370
 2014-11-19 20:29:42 +00:00
Greg Armendariz
2a45e40103 Merge "Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build" into omaha_14.4.1 
Former-commit-id: a945c99cfc [formerly e3c69ea595] [formerly aa32e3088a [formerly 0982fa7fb3657e11a2dfe3a17e51cafedd9cef21]]
Former-commit-id: aa32e3088a
Former-commit-id: d8c6db195d
 2014-11-19 13:08:28 -06:00
Shawn Hooper
a872090b54 VLab Issue #5375 - Update spec file for VADATUMS tar file. 
Change-Id: Id4cb17192ca46af4dc731ebae260c9a8a3acfd13

Former-commit-id: 3455a07e99 [formerly 50cd8ace64] [formerly f88d320e60 [formerly 83e81ee0af2d612f08f32e760e9f4d00ee1dd7aa]]
Former-commit-id: f88d320e60
Former-commit-id: 58fed17369
 2014-11-19 14:08:27 -05:00
Ron Anderson
72e6e56c75 VLab Issue #4953 Added support for managing JSON files in practice mode. 
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8

Former-commit-id: f88fc45470 [formerly bb451e58c3] [formerly 9104023408 [formerly e8ac81c5850b8565ea1e375857cf9dfe531848a0]]
Former-commit-id: 9104023408
Former-commit-id: 0991f722ec
 2014-11-19 11:31:49 -06:00
Ron Anderson
7b4fa1f69d Merge "Omaha #3549 improve performance of DataStoreResource processing of requests" into omaha_14.4.1 
Former-commit-id: 81ea897d8e [formerly 1823bd4801] [formerly 0610c71e2a [formerly e572e5586d80623e8c6453404dc94691bfd5014d]]
Former-commit-id: 0610c71e2a
Former-commit-id: 66f0e607c9
 2014-11-18 18:43:41 -06:00
Roger Ferrel
b86d906a5a Issue #3439 Replaced GFS213 with GFS229. 
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15

Former-commit-id: 85d717b49c [formerly 90a8b262f3] [formerly b88300a5fc [formerly 6cb88075375e3703b5ffe559ebd5e4f57d016880]]
Former-commit-id: b88300a5fc
Former-commit-id: 83c738abd9
 2014-11-18 17:42:39 -06:00
Mark Peters
5ee156873c Omaha #3300 Merge fixes for volume browser menus 
Change-Id: Id2d6f643f80982d7b5c4f195e21775ec5def4b43

Former-commit-id: b98bcbdb35 [formerly bcff3fc981] [formerly 666e8d4332 [formerly 1694a064c9496599532e9348a5eb89e558862e60]]
Former-commit-id: 666e8d4332
Former-commit-id: e08f52cc99
 2014-11-18 16:03:42 -06:00
Nate Jensen
80a5beed26 Omaha #3549 improve performance of DataStoreResource processing of 
requests

Change-Id: Ica72cded45aff23737c4b2aab8bbe94e0fc99755

Former-commit-id: 5d6dae89f2 [formerly 95d510849a] [formerly 089292dbd0 [formerly bab091169dff1383a3b78ea4b94ec67d446e5f80]]
Former-commit-id: 089292dbd0
Former-commit-id: 5de7b5ec07
 2014-11-18 15:22:09 -06:00
Mike Duff
1f1436a0da Issue #3026 - Fixed pattern to match the actual file names 
Change-Id: I957e2076cfa5ee4d59acc1a0db89066e446bfc99

Former-commit-id: edb85525d0 [formerly 9be37bb41e] [formerly f841f1eda9 [formerly 5a3ccbadbf08957a4f68a0cb7118c765ca44f849]]
Former-commit-id: f841f1eda9
Former-commit-id: f1c4463316
 2014-11-18 13:54:17 -06:00
Greg Armendariz
fa3eda0370 Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build 
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b

Former-commit-id: d3295027c2 [formerly ad5e3134e4] [formerly d7af478037 [formerly 0d4e39f166c8e8607d0a3c3f43f3656531e62e1e]]
Former-commit-id: d7af478037
Former-commit-id: 756d33bf89
 2014-11-18 13:48:19 -06:00
Ana Rivera
1e2e8ab03a VLab Issue #5355 - HTI Update: TCFloodingRainThreat.py (O&M RM16791); fixes #5355 
Change-Id: I6461bf9294f037a361f02d3a0de83bf41147e819

Former-commit-id: e125c384f5 [formerly ac523f4a45] [formerly f1009bccc2 [formerly 682cf4e6376265d0e590cfd1c05f7591204d0e0a]]
Former-commit-id: f1009bccc2
Former-commit-id: 4bdfe38866
 2014-11-18 16:06:22 +00:00
Steve Harris
602bd4ce21 Merge tag 'OB_14.3.1-33m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: bab60d0d89 [formerly e1106f77eb] [formerly 1d18722dca [formerly 9c77ee7c19b87501983acf88279205644e1692f2]]
Former-commit-id: 1d18722dca
Former-commit-id: c2309d6d4a
 2014-11-17 14:31:43 -06:00
Steve Harris
da8130d7be Merge branch 'master_14.3.1' (14.3.1-33) into omaha_14.3.1 
Former-commit-id: 9be298ac91 [formerly e8d5ccbc8c] [formerly 8372956276 [formerly 75097cfa26dbcff3adf0054a1f88d0d185f289fc]]
Former-commit-id: 8372956276
Former-commit-id: a0908d3bb0
 2014-11-17 13:46:28 -06:00
David Lovely
c84ae8ccc5 Issue #3804 BigNsharp Binary DLL 
Change-Id: Iaed7d84aeee537d884aa89942b6d0f14bb0a119d

Former-commit-id: 56536c7fa8 [formerly e8a2331f46] [formerly bfcc4cf523 [formerly 1e0d00304e70b89b9b2a9de96753aeebde32bb19]]
Former-commit-id: bfcc4cf523
Former-commit-id: d45c3f310d
 2014-11-17 12:40:13 -06:00
Nathan Bowler
8319efd9dd Omaha #3599 Fix typo in get_args() call. 
Change-Id: I7ad64eb987c0162ae4f31b76cbc386d06daf2a91

Former-commit-id: 3f4cf3b971 [formerly 1b201a0777] [formerly 595ea9686a [formerly 3916cf0e8b708bb0a6a5fde3208d1d0a77878a90]]
Former-commit-id: 595ea9686a
Former-commit-id: dd002faabd
 2014-11-17 11:05:23 -05:00
Fay.Liang
1d42c33173 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 99f1259dda [formerly 82f427924a] [formerly d666aca2b4 [formerly 3b21d69375ceb9c07377082c5e46a094742406a0]]
Former-commit-id: d666aca2b4
Former-commit-id: 03a71aa13a
 2014-11-14 16:24:25 -05:00
Fay.Liang
fc4643d2eb Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: e78e70cb81 [formerly 766685c4ec] [formerly 8ced3a4c73 [formerly 7fd3b02016b0d9eed7ecca9c2fd70c3f83695abc]]
Former-commit-id: 8ced3a4c73
Former-commit-id: b7da8368d3
 2014-11-14 12:47:46 -05:00
Lee Venable
58cf38e8f0 Merge "Omaha #3741 - Updated procedures for calculation of a center for zone and station." into omaha_14.4.1 
Former-commit-id: 2bcf529bd9 [formerly f198da3f4d] [formerly 9fde70a354 [formerly b6d35ac4e3aa430de7057a16f9d5516584833150]]
Former-commit-id: 9fde70a354
Former-commit-id: aba5c0cc19
 2014-11-14 11:14:16 -06:00
Ana Rivera
e49972bfcd VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318 
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847

Former-commit-id: 499c58a253 [formerly 061fd0af28] [formerly e54f3305d8 [formerly 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42]]
Former-commit-id: e54f3305d8
Former-commit-id: 23b3f1bc77
 2014-11-14 16:58:11 +00:00
Lee Venable
2debdb91ca Merge "Omaha #3650 - Added confirmation box for unsaved changes in the dialog." into omaha_14.4.1 
Former-commit-id: 8c05a42e49 [formerly d28ecb61cf] [formerly d0b2cb955c [formerly 8632472592ff0dc8611e528cb774d6b1586fea58]]
Former-commit-id: d0b2cb955c
Former-commit-id: 859b98a4e8
 2014-11-13 14:47:58 -06:00
Nate Jensen
df4476ce7b Merge "Omaha #3760 Moved to grid the remainder of derived parameters with no other explicit references" into omaha_14.4.1 
Former-commit-id: 8864443af8 [formerly 4d5fb1f014] [formerly 69505bc376 [formerly a532e9607d5e8fee053ef3bbfdc5c517ac481544]]
Former-commit-id: 69505bc376
Former-commit-id: 0d0815957c
 2014-11-13 14:40:41 -06:00
Mark Peters
e6e0af04c3 Omaha #3760 Moved to grid the remainder of derived parameters with no other explicit references 
Change-Id: Ifb12010b4527c18b4e498b5de5757bb74634b496

Former-commit-id: 36ebe9468c [formerly a3725b43bc] [formerly 7ae2b9524b [formerly fa93950435431248bd5790788e3a6936b4f4de2b]]
Former-commit-id: 7ae2b9524b
Former-commit-id: ee766624c5
 2014-11-13 13:34:42 -06:00
David Lovely
bf66116b50 Omaha #2991 Fixed REST URL in Python scripts, Added checks to broker build commands to fail if they didnt work. 
Change-Id: I9bc88caa14d08861eb4dd4628b729bedc8500325

Former-commit-id: 132ac21917 [formerly e0525f7816] [formerly 3686a36ae7 [formerly 89acb99f0639f34e4ba3530e49c81ce5dda42785]]
Former-commit-id: 3686a36ae7
Former-commit-id: 66e3669532
 2014-11-13 10:59:00 -06:00
Fay.Liang
cc1cda2e98 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: aef63b4991 [formerly 3ed251486c] [formerly cfe2f18790 [formerly 3f94c7f0ddbf580576b435a715366e3b9f3d9a53]]
Former-commit-id: cfe2f18790
Former-commit-id: e3c647e49e
 2014-11-13 11:50:16 -05:00
Nate Jensen
4f2b760876 Merge "Omaha #3805 Increase time of cluster lock, cleanup statictopo plugin." into omaha_14.4.1 
Former-commit-id: c71c893f57 [formerly e2ee787b63] [formerly 1c2d8dc1a6 [formerly d6e12ddac807e109746f1614b4fd74d49fe259ca]]
Former-commit-id: 1c2d8dc1a6
Former-commit-id: 7f83029fdb
 2014-11-13 09:45:40 -06:00