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
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
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
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
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
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
steve.naples
d0a5bc2d8b
ASM #15660 Fixed issues with saving disagg data.
...
Change-Id: I6f0e8b02b7035e9d9614c52718026fce81b2e331
Former-commit-id: 31a7909085
[formerly 3ecaf0c634
[formerly 4646f7396153651359624f3dd12660810fe2bf6e]]
Former-commit-id: 3ecaf0c634
Former-commit-id: 4dd189791e
2015-03-03 21:02:54 +00:00
Juliya Dynina
03789c14eb
Merge "ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable." into asm_14.4.1
...
Former-commit-id: 25b044355a
[formerly cc0d8eaf8a
[formerly dd529eadfb006ff48cc975ae7926c06bf952f271]]
Former-commit-id: cc0d8eaf8a
Former-commit-id: a83d35b986
2015-03-03 09:55:58 -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
Shawn.Hooper
14aba20c37
Merge "ASM #17175 - Increase the JVM heap size to 2560M for I-met client" into asm_14.4.1
...
Former-commit-id: 2f8cc3993a
[formerly 264a1a0274
[formerly 0a2dce294e4dc37b10fc08ee2ca6cee9efaee4df]]
Former-commit-id: 264a1a0274
Former-commit-id: 9b6d2c0bd2
2015-02-26 13:23:51 -05:00
Shawn.Hooper
c887f6cb74
ASM #17175 - Increase the JVM heap size to 2560M for I-met client
...
Change-Id: I88c6a9a40b2145d9dd013b7c78d22af57fd7d987
Former-commit-id: f36dce4f91
[formerly b5224e393c
[formerly cdc6bacc3b8b162a90b0ec8921b6805d77bccf23]]
Former-commit-id: b5224e393c
Former-commit-id: 2255c32cfc
2015-02-26 13:18:14 -05:00
Shawn.Hooper
d1f7bb1be6
ASM #17168 - Add directory/files needed to create new decoderpostprocessor rpm
...
Change-Id: Id0cd2a97147cfb1a041e8b09ed155dafd67b1256
Former-commit-id: 3a31571f60
[formerly fb99c62e1a
[formerly b67527007223dd0fbb2a6c5c17ef7fb6a68b2410]]
Former-commit-id: fb99c62e1a
Former-commit-id: 72abfa1668
2015-02-26 13:15:17 -05:00
David Friedman
08d7e997f7
ASM #14990 - Add pqact patterns for earthquake and tsunami products
...
Change-Id: Ied72bd5896a9e1939f4ddd9d68cb362067406d65
Former-commit-id: 1afdea35fb
[formerly cc2c3da325
[formerly 899c6472abfdcfa27018d20cc204735dea4d2f43]]
Former-commit-id: cc2c3da325
Former-commit-id: 12987b265a
2015-02-24 15:33:48 +00:00
Fay.Liang
1fc9ba7700
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 1cc803376d
[formerly 1734fc095b
[formerly a838f2895c4c22dc3c6404fb892dfbf9d36815fd]]
Former-commit-id: 1734fc095b
Former-commit-id: 5200072e27
2015-02-20 10:28:07 -05:00
Shawn.Hooper
fdbe5ce2f8
Moved the CIMSS, gsd, and ncep directories to separate repos
...
Change-Id: I4caa5d7425129d8d5df6c721b23226558ab4e2b3
Former-commit-id: 22df67d70c
[formerly 3d169da195
[formerly 5ed3823b82d5da57a3c1f1a7e4331911670acc28]]
Former-commit-id: 3d169da195
Former-commit-id: 3bb5371f91
2015-02-20 08:04:15 -05:00
Fay.Liang
f1e6be9aaf
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 0072544dba
[formerly 20231cb1f2
[formerly 5dea200def84ed80d2bc38e37e1fe9bf3ac5b26c]]
Former-commit-id: 20231cb1f2
Former-commit-id: c73879c8c4
2015-02-19 13:12:16 -05:00
David Friedman
f7649af19e
ASM #17125 - Fix decoding of upper air collectives
...
Change-Id: I20e342561ce80460b2c1189277a45de539bc6540
Former-commit-id: ab8a709eb6
[formerly 79fb68aeb1
[formerly 420ca2787415f4f609fd6016ace1435f87b740f4]]
Former-commit-id: 79fb68aeb1
Former-commit-id: 38bf119d23
2015-02-18 16:21:31 +00:00
Fay.Liang
4be7ba08fb
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 31dcfdc402
[formerly a534707534
[formerly ef870235658ea88d676ca65611bcfbdd56d206b1]]
Former-commit-id: a534707534
Former-commit-id: 058bd4ae9c
2015-02-17 14:07:11 -05:00
Sean.Webb
289d7078aa
ASM #17142 - Fixed nwps dir permissions
...
Change-id: Ibd843098cea02d3f1ea6b75d3e715d804c5c1e37
Former-commit-id: edae59425b
[formerly 9d46bf24dc
[formerly fc7258495581cd1d241f55aba2a8e60053575571]]
Former-commit-id: 9d46bf24dc
Former-commit-id: 62e125667f
2015-02-17 12:29:55 -05:00
Fay.Liang
c37a5fe707
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 5af44f02e0
[formerly 40e08b3f99
[formerly 49f4bfffc2197ab78eead4de677f1ab9e4bf37a2]]
Former-commit-id: 40e08b3f99
Former-commit-id: 0d69148241
2015-02-17 10:50:41 -05:00
Ana Rivera
04aa4b6cbe
Merge "VLab Issue #6412 - Fixed the problem with ParameterLookup not being registered. As per Nate Jensen recommendation updated the spring configuration to depepnd-on getParameterHandlerRegistered. Also based on his recommendation removed parts from constructor and added them to the decode method that get singleton references for paramlookup and variable dictionary lookup. fixes #6412 " into field_14.4.1
...
Former-commit-id: 94d705e210
[formerly 76b6b292cb
[formerly 6f58cd962cc7995af01b96db1210e24b63429372]]
Former-commit-id: 76b6b292cb
Former-commit-id: a2f42298b6
2015-02-13 19:51:48 +00:00
Fay.Liang
7c53d1fccc
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Former-commit-id: af8b95bb97
[formerly 8cdd180b0a
[formerly fd4e0b9ada38ab93586088948809279e39a0374c]]
Former-commit-id: 8cdd180b0a
Former-commit-id: c95baa3c40
2015-02-13 09:34:24 -05:00
Fay.Liang
209b1f9e7c
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: eefa05ada3
[formerly 32c91172b4
[formerly 480b6597331ebd2ce7d7835de6e21050abf18722]]
Former-commit-id: 32c91172b4
Former-commit-id: 84dff9abc0
2015-02-13 09:32:40 -05:00
Fay.Liang
6d85666c42
Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 92d4e5b370
[formerly adc24b15b6
[formerly c08dc1a7d558fba175460ef8255fc3b7b1db5c71]]
Former-commit-id: adc24b15b6
Former-commit-id: b54c101e34
2015-02-13 09:29:20 -05:00
Shawn.Hooper
77344aeb28
ASM #15083 - Updates to allow nwps to be released in the gfesuite-server rpm
...
Change-Id: I9ab3fca601120954ebe229d3a4f0871b7b43af28
Former-commit-id: 9c637bda0b
[formerly 060a169904
[formerly 2c62f45654b0531349fef5e7523c67c94236ce1a]]
Former-commit-id: 060a169904
Former-commit-id: 0d9e4dd69e
2015-02-12 17:32:05 -05:00
David Lovely
d71e91a297
Omaha #3300 Fixing merge errors in PointPrecipPlotResource
...
Change-Id: I6c5b8f0f2e590b0cf0440c1885435c2bf5649df4
Former-commit-id: 25f32b4c70
[formerly 56c3135aef
[formerly e7968f03e688e7dbad9a2e87b9de7f0664997a5f]]
Former-commit-id: 56c3135aef
Former-commit-id: 260a818778
2015-02-12 09:16:30 -06:00
Juliya Dynina
0858e5a32c
Merge "ASM #17092 - Add cronOTRs.xml to radar NDM files" into asm_14.4.1
...
Former-commit-id: 39e3497493
[formerly ea11991a31
[formerly 346fc7563a680155c286bcbbcdaea25ec12b30fc]]
Former-commit-id: ea11991a31
Former-commit-id: 92d2d08451
2015-02-12 09:20:27 -05:00
Ana Rivera
46215020b2
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209
Former-commit-id: 6191c93a9c
[formerly 420132b396
[formerly f6b3765fc1670db2b9ceef75be7422a07b2badcf]]
Former-commit-id: 420132b396
Former-commit-id: 461db8a395
2015-02-11 22:00:40 +00:00
Steve Harris
a2d87f74f7
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
...
14.4.1-10
Former-commit-id: 9311e6f440
[formerly 3fe3d35339
[formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]]
Former-commit-id: 3fe3d35339
Former-commit-id: e76330fac0
2015-02-11 15:53:38 -06:00
Fay.Liang
a0dc16d150
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: eef951faea
[formerly 5ed7f62638
[formerly 3905161a55f66efb33b1fe4bc016545b367e88c1]]
Former-commit-id: 5ed7f62638
Former-commit-id: 4f75f6d15e
2015-02-11 15:36:25 -05:00
Fay.Liang
8a38eb3a97
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 1208dbde06
[formerly 30859f6ee6
[formerly bc482f433223eee5f9a2fa209e1e33a39d3b3aa8]]
Former-commit-id: 30859f6ee6
Former-commit-id: 8d4bab98d5
2015-02-11 15:36:05 -05:00
Jason Burks
b729c8dac9
VLab Issue #6412 - Fixed the problem with ParameterLookup not being registered. As per Nate Jensen recommendation updated the spring configuration to depepnd-on getParameterHandlerRegistered.
...
Also based on his recommendation removed parts from constructor and added them to the decode method that get singleton references for paramlookup and variable dictionary lookup. fixes #6412
Change-Id: Ie3554842b9f029dd62ff73f5edc928bc03e012e4
Former-commit-id: 9b0f630436
[formerly 0163ec2871
[formerly 2ca313195e2e610d4a198884f45dde37ebecfbc6]]
Former-commit-id: 0163ec2871
Former-commit-id: c28f2e9aed
2015-02-11 20:06:54 +00:00
Shawn.Hooper
77ae8677e4
ASM #14246 - Check-in updated transmit_rfc_qpe script
...
Change-Id: I26751d39d2b31a345276da722c7a25a9ff8f9508
Former-commit-id: 3c3b69809d
[formerly 0ba143cc43
[formerly 72dd2f411e10e1eb6a934adf05d7df179b570ded]]
Former-commit-id: 0ba143cc43
Former-commit-id: a6a840f3c8
2015-02-11 13:55:20 -05:00
Shawn.Hooper
9f7f129edb
ASM #16804 - Check in the required library files
...
Change-Id: Ib84d554ef4723072f8272327b7d00a737ba1405a
Former-commit-id: ca8b043aed
[formerly 6573bd2672
[formerly 22fc7ef208aaef87d2ef366f9ae8c0840379139c]]
Former-commit-id: 6573bd2672
Former-commit-id: 8351eb7bdf
2015-02-11 12:40:33 -05:00
Steve Harris
162f4871bf
Omaha #4111 - Updated foss licenses and Master_Rights_File.pdf
...
Former-commit-id: a5da551a5d
[formerly 62d29fefb4
[formerly 45e09e8f848d85ae45205b655074bba8342c9156]]
Former-commit-id: 62d29fefb4
Former-commit-id: 3f8008fc9f
2015-02-11 10:58:07 -06:00
Fay.Liang
0ecd208056
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 7d18af7172
[formerly a2a4551eae
[formerly 0c3fe94f92b6f43d8ae7d506c5c84915500a803c]]
Former-commit-id: a2a4551eae
Former-commit-id: 5c320554c0
2015-02-11 10:45:04 -05:00
David Friedman
a8b7c34e09
ASM #17092 - Add cronOTRs.xml to radar NDM files
...
Change-Id: I46bf0728607737509ad97f6d2ed1803b3b10eeff
Former-commit-id: 562582f056
[formerly c6c9209f84
[formerly fc9eb096ce16005be0a80eff3b4728f279f75cf5]]
Former-commit-id: c6c9209f84
Former-commit-id: 6db744c3cc
2015-02-11 15:10:34 +00:00
Joshua Watson
00243dfdfc
VLab Issue #6421 - Source in GFSLAMPGrid.py smart init changed to GFSLAMPGrid. Visibility calculation streamlined; fixes #6421
...
Change-Id: Ic63cb16c30aff1705d9753017a43ba9c59b02d51
Former-commit-id: f612e85eed
[formerly 56627a9012
[formerly c570ea9f982665f3cb560c665cea6357c11841ce]]
Former-commit-id: 56627a9012
Former-commit-id: 786721c6e8
2015-02-11 09:04:44 -05:00
Juliya Dynina
9a5e754fd5
Merge "ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer." into asm_14.4.1
...
Former-commit-id: 5ae6e8149e
[formerly a2da3621ee
[formerly fa16cbd1cf7c92545d22b39c1bca597a0959c98c]]
Former-commit-id: a2da3621ee
Former-commit-id: 43b453b136
2015-02-10 15:45:27 -05:00
Michael Gamazaychikov
563e176546
ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer.
...
Change-Id: Ib5c6bb89c57022b61260adbaa08760e5df05ad61
Former-commit-id: 9ffad49fa0
[formerly ea046bedd3
[formerly 20efa852dcc64c80890abed6b2882a205b37cf43]]
Former-commit-id: ea046bedd3
Former-commit-id: 4a58408889
2015-02-10 15:21:32 -05:00
Michael Gamazaychikov
9aaeca7d9d
ASM #17103 - New dx3/4 hardware can drive EDEX OoM.
...
Change-Id: I0e466f39b50661cc0909158611aab2f7fdda06ba
Former-commit-id: 796871f02f
[formerly cecc02d5b1
[formerly e4444751f61adccf1cb62adf0f6cb1abc4ab6384]]
Former-commit-id: cecc02d5b1
Former-commit-id: 9836b17e5e
2015-02-10 10:35:32 -05:00
Ana Rivera
c2975ce69f
Merge branch 'omaha_14.4.1' into field_14.4.1
...
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f
Former-commit-id: c2f02ff4b2
[formerly bdb0e3aacb
[formerly c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265]]
Former-commit-id: bdb0e3aacb
Former-commit-id: 631d700cf9
2015-02-10 14:41:19 +00:00
Fay.Liang
4bcae42022
Merge branch 'master_14.3.2' into master_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: 43c7161dcf
[formerly 59f3f87190
[formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]
Former-commit-id: 59f3f87190
Former-commit-id: e3107ce1e4
2015-02-09 17:19:41 -05:00
Greg Armendariz
b99479a3c6
Omaha #3299 - Update buid.xml to work with nightly build and development workstation
...
Former-commit-id: 5685c69da3
[formerly ca6440c80e
[formerly ab3ed9118dfd90ea929e450d991d882312f4a520]]
Former-commit-id: ca6440c80e
Former-commit-id: c8d4fb79dd
2015-02-09 14:57:22 -06:00
Greg Armendariz
8815b6bf9d
Merge "Omaha #3299 - Fix collaboration RPM build issue" into omaha_14.4.1
...
Former-commit-id: 3b596f12d8
[formerly 40e2f812cc
[formerly da49b73121818f3022f71deee8a2a57230b2a227]]
Former-commit-id: 40e2f812cc
Former-commit-id: a1ee800641
2015-02-09 10:09:20 -06:00
Nate Jensen
9fe563bb9e
Merge "Omaha #3299 - Modify RCM deploy script" into omaha_14.4.1
...
Former-commit-id: 2bd03ecec0
[formerly 35295b401c
[formerly 24849a362531a27a789ef3ea512bed87d7159af8]]
Former-commit-id: 35295b401c
Former-commit-id: 66c3ef37ca
2015-02-09 09:19:45 -06:00