Commit graph

6346 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Ron Anderson
19800d6f27 VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files.
Change-Id: Ie25fce637e4294dd20bcfa3933d29b7bf6cc1f30

Former-commit-id: 80670c1b7a [formerly 04b8ffbcd2] [formerly fe531a33e5 [formerly c9d45db2fe6d4693c02b8788d0c7d44b21f5359f]]
Former-commit-id: fe531a33e5
Former-commit-id: 0a6164461a
2014-11-12 14:50:21 -06:00
Fay.Liang
9bb87255ec Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: e9c6950cc3 [formerly 74d7123627] [formerly 4bef6cf18d [formerly a141921090ecec459e99d448025f58ca6a957fa6]]
Former-commit-id: 4bef6cf18d
Former-commit-id: d7ae488e81
2014-11-10 14:08:25 -05:00
Sarah Pontius
853526b594 VLab Issue #5277 - HLS/TCV code for OPG 11-17-2014; fixes #5277
Change-Id: I258b2f8c8ddb7f45b02b1035f6fa5006b9fabe1b

Former-commit-id: d20799e942 [formerly 1ae8fe99aa] [formerly 061583cd50 [formerly 0db3944372ecc381df4e8a918829530391d598db]]
Former-commit-id: 061583cd50
Former-commit-id: bc572fc945
2014-11-10 11:20:09 -07:00
Brian.Dyke
b11b0868ef Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 6161c5ea4f [formerly a6f8a3b109] [formerly 01c3167dc9 [formerly bc44629025f7070a97fcff4a00939e509e6987b1]]
Former-commit-id: 01c3167dc9
Former-commit-id: 4639e2c25d
2014-10-29 16:39:06 -04:00
Sarah Pontius
5bb52ed311 VLab Issue #5129 - Merging code from tropical_hazard_formatters to tcv_14.3.2; fixes #5129
Change-Id: Ia7365620c5cc803faa25af4d6c32d3e394497626

Former-commit-id: 8d3958527b [formerly d7e8bc97b6] [formerly 760c0d6532 [formerly eee97946890b5b0df941e2665a4a183eece14598]]
Former-commit-id: 760c0d6532
Former-commit-id: bbe1125b56
2014-10-29 13:33:24 -06:00
Brian.Dyke
19eeee8c30 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 77b206664f [formerly 9907c37a0e] [formerly 94ddd59bfc [formerly d12d6cf7e6862a87c00f833ee02e72e5c0ad8252]]
Former-commit-id: 94ddd59bfc
Former-commit-id: b396cc467c
2014-10-28 15:25:05 -04:00
Brian.Dyke
972a6e517c Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm

Former-commit-id: fe00e65407 [formerly f8ce701c85] [formerly 765359aee6 [formerly 52ba693c7d77f4e29db6bc5202c9764509bce58d]]
Former-commit-id: 765359aee6
Former-commit-id: 957781a1b2
2014-10-28 15:23:11 -04:00
Baoyu Yin
0cfd20d2ae VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 28 fix for FFW error ; fixes #4796
Change-Id: I4f43f1365c3ad4d11314f199c4d896aa542a48c0

Former-commit-id: 3481a6eee5 [formerly c9bc14a668] [formerly 4252ccfcb1 [formerly 54d2f956f53d2fe8a6fa0550a4236d95013b8ba8]]
Former-commit-id: 4252ccfcb1
Former-commit-id: 8f9c70f4f7
2014-10-28 14:32:31 -04:00
Baoyu Yin
35c673732c VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 27 ; fixes #4796
Change-Id: I636b0cbb46b31f46cb2d017a4b3047108c98f0c9

Former-commit-id: cc1bf99ad3 [formerly 2c0c42dcdd] [formerly bb89f99643 [formerly b447742f498bceaf5f522a637d6ae501f80dfa23]]
Former-commit-id: bb89f99643
Former-commit-id: f64eb6adb4
2014-10-27 10:15:39 -04:00
Baoyu Yin
d9a5a45bb7 VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 24 ; fixes #4796
Change-Id: I2df1ea83b9cd17735ee835914febd3739ff4671d

Former-commit-id: e0b0edd8e1 [formerly c1d51b3588] [formerly fe574dd41d [formerly ecc2b0c99a4e849b9472dd6c0cd63416e880d4cb]]
Former-commit-id: fe574dd41d
Former-commit-id: 377c4ba8e5
2014-10-24 14:28:08 -04:00
Brian.Dyke
2932058e2c Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 77f518abc1 [formerly dc0810a926] [formerly 9a5d1450b2 [formerly 546badba2c4dceb628b248d980baf571c6f44944]]
Former-commit-id: 9a5d1450b2
Former-commit-id: 7b395d423f
2014-10-24 14:01:28 -04:00
Brian.Dyke
1a409740cf Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 3f983ee440 [formerly 382bf468ef] [formerly 7bbaafabaa [formerly 46ab2183dfeb66020368e7d079f59f21e31c37eb]]
Former-commit-id: 7bbaafabaa
Former-commit-id: 8aebfda90f
2014-10-24 13:57:32 -04:00
Shawn.Hooper
f133c3e7e2 ASM #533 - Add delta script for 14.3.1 to delete FSS Obs Config Files
Change-Id: Id3c5cd06222eb62d50588c03f9d0ea6667883011

Former-commit-id: 3e833a488b [formerly ba89dbce5c] [formerly e83e14dcb1 [formerly 040665f65dead38fed0e4ca6176b422c8e6c9f1b]]
Former-commit-id: e83e14dcb1
Former-commit-id: cd71b1c4e2
2014-10-24 13:06:29 -04:00
Matthew Howard
09162268b9 Merge "ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility" into asm_14.3.1
Former-commit-id: 56dc0eb99f [formerly f1d793c8f5] [formerly 4b542e6e5b [formerly aa43d958820f8873a982d24d9c73760eb430ddc7]]
Former-commit-id: 4b542e6e5b
Former-commit-id: 92d4322bf4
2014-10-24 10:06:56 -05:00
Rici.Yu
7de71523c3 ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility
Change-Id: Ia377d571db68d0078399460ad1d434ba4dad510b

Former-commit-id: 28294702a5 [formerly 45e3b2895b] [formerly b9269162a6 [formerly 902d1b1e4fed90ff216eab2ee5fc3f198bf7fc6d]]
Former-commit-id: b9269162a6
Former-commit-id: c65088c5da
2014-10-24 10:54:37 -04:00
Shawn.Hooper
0510185ff8 ASM #16871 - Checkin: MPE Gage Table: columns do not sort in descending order
Change-Id: I197c3049e39ad0c5f5edca8926ff1afdaca20e2f

Former-commit-id: 1c025e7a9d [formerly 7a7d877c17] [formerly f5b9798c3d [formerly ce7ade3d25263f5af09073e4877b018a84f195a3]]
Former-commit-id: f5b9798c3d
Former-commit-id: 154ad67a31
2014-10-24 09:47:54 -04:00
Stephen Gilbert
c0e2c341da VLab Issue #5064 - Compare and Edit functions not working in SHARP(D2D);
fixes #5064

Change-Id: I3c9bf22b767dbc67fa70291989c694d39945d112

Former-commit-id: 373ecc99e4 [formerly c94b2187f6] [formerly 302779155f [formerly ee20131811fba389f001870d3274b32adfee3f28]]
Former-commit-id: 302779155f
Former-commit-id: db0806d9a4
2014-10-23 12:36:30 -04:00
Stephen Gilbert
5ef5b5733a VLab Issue #5063 - NSHARP(D2D) does not load using Volume Browser; fixes
#5063

Change-Id: Idd83363e5235868939c2251239264eb73863efb7

Former-commit-id: 0181780c3c [formerly 97bd608624] [formerly 5e1e9f6f58 [formerly b59616510517bf52d23edaf055e9d4a53b26e2dc]]
Former-commit-id: 5e1e9f6f58
Former-commit-id: 604d44817f
2014-10-23 12:33:50 -04:00
Brian.Dyke
ef08117a63 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 564db5cd87 [formerly 9199e8b072] [formerly 268f76df74 [formerly 97623c832e9ba336959d6f4f11045ec9738657eb]]
Former-commit-id: 268f76df74
Former-commit-id: b1608227ef
2014-10-22 14:51:41 -04:00
Shawn.Hooper
b1426303fa ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868

Former-commit-id: 114ff128ed [formerly 0e372cd13e] [formerly 3b4b9d262a [formerly e29cf5a57591e5a25b6e73b267c0abb46e9f95c2]]
Former-commit-id: 3b4b9d262a
Former-commit-id: d62f27cae6
2014-10-22 14:47:42 -04:00
Brian.Dyke
a16d6c944f Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 975f877994 [formerly 9bcc6bb52e] [formerly abb4203634 [formerly c8cd8594507148284ac3ec2283fcc9e152c532a6]]
Former-commit-id: abb4203634
Former-commit-id: 40717fa44c
2014-10-22 10:39:36 -04:00
Shawn.Hooper
86d953da5c Merge "ASM #13467 - Update GenericHazards.py for Shannon" into asm_14.3.1
Former-commit-id: d998d23eb4 [formerly 4e0cb152d2] [formerly 92204e05a1 [formerly 4bbcf01f8a3abf038f3183c5872bc8f9f12624a1]]
Former-commit-id: 92204e05a1
Former-commit-id: f1841b5042
2014-10-21 10:35:01 -05:00
Shawn.Hooper
78cd702d20 ASM #16805 - Fix rpms/legal/ directory
Change-Id: I369e4d5423c760bf689180239f15cfd363a202b3

Former-commit-id: 26054621ca [formerly d0fba5965b] [formerly a96693cb70 [formerly 94872b496bec6c427030ea353856466809d2e6c1]]
Former-commit-id: a96693cb70
Former-commit-id: f98e05c9de
2014-10-21 11:17:45 -04:00
Shawn.Hooper
115a9c1fd9 ASM #13467 - Update GenericHazards.py for Shannon
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e

Former-commit-id: 700bc0691c [formerly 4d81023184] [formerly ddeec493c3 [formerly f4e8f7493bbfb025e8040f7663dc582414a87413]]
Former-commit-id: ddeec493c3
Former-commit-id: f1feaee0ea
2014-10-21 11:11:34 -04:00
Matthew Howard
31e1eaf1cf Merge "ASM #16858 - Check in SerpISC tool." into asm_14.3.1
Former-commit-id: cf3afaf2bb [formerly 8827f5e49c] [formerly 587cf1b66e [formerly 4a965632119a9349cf320125b97db52498a760c8]]
Former-commit-id: 587cf1b66e
Former-commit-id: 612cf99edb
2014-10-20 13:56:06 -05:00
Rici.Yu
f069fa1fea ASM #16858 - Check in SerpISC tool.
Change-Id: I4c15360c377370bd757ed2eaad7aeade49412fd6

Former-commit-id: 51adc6a204 [formerly 9c2555466c] [formerly 6958f11ea7 [formerly 1e8961e4f4a8168b667ce4b689efd88157dfb61c]]
Former-commit-id: 6958f11ea7
Former-commit-id: 5c22571568
2014-10-20 14:39:46 -04:00
Shawn.Hooper
c491bf611e ASM #16805 - Update master rights and license files for 14.3.1.
Change-Id: Ifb5b67010a01dfa9805e64d408f5688d10d7bf82

Former-commit-id: 217f39ee04 [formerly e24cb3c37e] [formerly 65065f2380 [formerly f72ec046e98bdb6734dbce10ef472dd5294c59ba]]
Former-commit-id: 65065f2380
Former-commit-id: e50becc648
2014-10-20 14:36:31 -04:00
Slav Korolev
7df98880af Issue #2757 - Fixed a problem with duplicate zones.
Former-commit-id: bde08f6c38 [formerly 0d4ed62be4] [formerly 079b74d69c [formerly 8929c542c33090555dd9db16113453e1000c6e5b]]
Former-commit-id: 079b74d69c
Former-commit-id: 7555a3be9d
2014-10-20 13:08:44 -04:00
Dave Hladky
029a0dd15a Issue #3736 Allow shared subscriptions to have adhocs
Change-Id: I2379ac2cd1f02b36587531b448b8c3e6434664f9

Former-commit-id: 8a4711aa8d [formerly 19840e43f3] [formerly 5cde2fa48c [formerly a5a2b995e5dd4a7af165f62496d8052ed43d23b4]]
Former-commit-id: 5cde2fa48c
Former-commit-id: 87ae74320e
2014-10-20 08:58:08 -05:00
Nate Jensen
8ab9c456da Merge "Issue #3707 Reworked gridded subscription triggereing for retrievals. Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176" into omaha_14.3.1
Former-commit-id: 68e1e93532 [formerly dcce72b823] [formerly cfb24faf68 [formerly 57848f31cc73d81d16595e4e5b01949bcff12a24]]
Former-commit-id: cfb24faf68
Former-commit-id: 6593a843e4
2014-10-20 08:37:41 -05:00
Dave Hladky
55c5454bd5 Issue #3707 Reworked gridded subscription triggereing for retrievals.
Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176

Former-commit-id: 468276afdd [formerly a3268ae60d] [formerly c7df290186 [formerly eb64bd232cd25a71dbac655f4d59f9ec10b841b4]]
Former-commit-id: c7df290186
Former-commit-id: 54e397a561
2014-10-17 16:01:47 -05:00
Brian.Dyke
bde528063d Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 498abd3716 [formerly 418894a17b] [formerly 93df82ac92 [formerly f0f79fb324665245ef759947d24514a6c8bc4470]]
Former-commit-id: 93df82ac92
Former-commit-id: 8af5c9870e
2014-10-16 12:04:27 -04:00
Sean.Webb
cbdb5b8911 ASM #16827 - Added 6th channel configuration, and change logrotate to handle goes_add.log
Change-Id: I2012ac01d51ed11c077d06b638ede4b990bce5cd

Former-commit-id: b256e04c45 [formerly 36d39be5fd] [formerly 5f6c9bc837 [formerly c11e78b57bca7d242d4d8c29dc51669d7aebb37d]]
Former-commit-id: 5f6c9bc837
Former-commit-id: 1cbbc5bd59
2014-10-16 10:38:14 -05:00
Shawn.Hooper
08ec650f2f ASM #13467 - Fix for GFE: Need to add Beach Hazards Statement
Change-Id: I9d19a76afff8e4c36db20aec15b997eefc260209

Former-commit-id: ee70a6a4bd [formerly eafaf01966] [formerly 118f34bbf1 [formerly 366c7c478c6d83f8d21e3b30cc664a32cabf08bd]]
Former-commit-id: 118f34bbf1
Former-commit-id: cd6be50dd6
2014-10-16 11:30:29 -04:00