Commit graph

11458 commits

Author SHA1 Message Date
Roger Ferrel
aedb4632d7 Omaha #4462 Always set text product's site when writing standard text product.
Former-commit-id: c6e0f2dc7c [formerly 14b7158f8dc7d5ea35ff95fd03957527760d72ba]
Former-commit-id: a4c089b452
2015-05-05 12:30:55 -05:00
Shawn.Hooper
14873814b6 ASM #17024 - Moved ndmMenuIngester.sh to build/deploy.edex.awips2/esb/bin/
Change-Id: I13f0db113db1582c57c6f2a42a5b2903a118530b

Former-commit-id: 83906db315 [formerly 209589704fecd76aae472171ef6266eab39cefbb]
Former-commit-id: d9d27d625b
2015-05-04 10:53:21 -04:00
Shawn.Hooper
d18a2fea70 ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33
Merge 14.4.1-33 into 15.1.1-8

Change-Id: Iaebe94615f952be4b294aea0bcba04117b903e9c

Former-commit-id: 48e06c41ad [formerly 1f63e395c67afa5106bde7b96b72d4b3111221d3]
Former-commit-id: 7eac415eaa
2015-05-01 16:12:48 -04:00
Matthew Howard
1dd018813a Merge "ASM #17421 - Fix missing storm total snow phrase issue" into asm_14.4.1
Former-commit-id: f2a7d2191c [formerly 7255a63aa1 [formerly 98ee9069fe] [formerly f2a7d2191c [formerly 563250f714cf09b4038954f31330c55686bb80a5]]]
Former-commit-id: 7255a63aa1 [formerly 98ee9069fe]
Former-commit-id: 7255a63aa1
Former-commit-id: 82f92d6a61
2015-05-01 12:44:21 -05:00
Matthew Howard
7255a63aa1 Merge "ASM #17421 - Fix missing storm total snow phrase issue" into asm_14.4.1
Former-commit-id: f2a7d2191c [formerly 563250f714cf09b4038954f31330c55686bb80a5]
Former-commit-id: 98ee9069fe
2015-05-01 12:44:21 -05:00
Rici.Yu
63759522a8 ASM #17421 - Fix missing storm total snow phrase issue
Change-Id: I231808bc7a9c8762efd2bf70dbc5a1e9dbb9d5e5

Former-commit-id: 662f40abab [formerly a99dc0efaa [formerly 213853ccaa] [formerly 662f40abab [formerly c3e17145980c3ce036862691ef22d6347e6bbbb1]]]
Former-commit-id: a99dc0efaa [formerly 213853ccaa]
Former-commit-id: a99dc0efaa
Former-commit-id: 484a1a0902
2015-05-01 11:11:27 -04:00
Rici.Yu
a99dc0efaa ASM #17421 - Fix missing storm total snow phrase issue
Change-Id: I231808bc7a9c8762efd2bf70dbc5a1e9dbb9d5e5

Former-commit-id: 662f40abab [formerly c3e17145980c3ce036862691ef22d6347e6bbbb1]
Former-commit-id: 213853ccaa
2015-05-01 11:11:27 -04:00
Fay.Liang
ba775f16ad Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 8e287832b0 [formerly a79d9a94a6 [formerly 9996708bf6] [formerly 8e287832b0 [formerly b2291ed3867f9814affad55f8f3251da42243255]]]
Former-commit-id: a79d9a94a6 [formerly 9996708bf6]
Former-commit-id: a79d9a94a6
Former-commit-id: 204c9650e2
2015-04-29 20:17:45 -04:00
Fay.Liang
a79d9a94a6 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 8e287832b0 [formerly b2291ed3867f9814affad55f8f3251da42243255]
Former-commit-id: 9996708bf6
2015-04-29 20:17:45 -04:00
Fay.Liang
3cd5f63433 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 7819c3384f [formerly d0f2e1f2e4 [formerly a6a4bfed63] [formerly 7819c3384f [formerly 6eabbc0de9b13e8279876fb5b8b1463a6b2ab71b]]]
Former-commit-id: d0f2e1f2e4 [formerly a6a4bfed63]
Former-commit-id: d0f2e1f2e4
Former-commit-id: 03c04dd6e6
2015-04-29 20:13:27 -04:00
Fay.Liang
d0f2e1f2e4 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 7819c3384f [formerly 6eabbc0de9b13e8279876fb5b8b1463a6b2ab71b]
Former-commit-id: a6a4bfed63
2015-04-29 20:13:27 -04:00
Fay.Liang
0a93279130 ASM #17430 - Update manifest file to fix cave initialization issue
Change-Id: Ic40427809b60f926456195988bfd5fa1cc8f7ce9

Former-commit-id: 57a5d0e226 [formerly be329e0161 [formerly 7f4c24ea15] [formerly 57a5d0e226 [formerly 491d3787118242762a756bcd9f913c59da13853d]]]
Former-commit-id: be329e0161 [formerly 7f4c24ea15]
Former-commit-id: be329e0161
Former-commit-id: 7748b05491
2015-04-29 20:08:52 -04:00
Fay.Liang
be329e0161 ASM #17430 - Update manifest file to fix cave initialization issue
Change-Id: Ic40427809b60f926456195988bfd5fa1cc8f7ce9

Former-commit-id: 57a5d0e226 [formerly 491d3787118242762a756bcd9f913c59da13853d]
Former-commit-id: 7f4c24ea15
2015-04-29 20:08:52 -04:00
Ying-Lian.Shi
e0fdc85dc0 ASM #17430 manifest add bundle com.ratheon.uf.common
Change-Id: I0df50f0652436dbff4762ea8ae318b9071ad322d

Former-commit-id: 1d7e10ce67 [formerly a5077be6b6 [formerly 9ad20eab53] [formerly 1d7e10ce67 [formerly 6a6c45ce0da6ee5305e127efe57342a687d36821]]]
Former-commit-id: a5077be6b6 [formerly 9ad20eab53]
Former-commit-id: a5077be6b6
Former-commit-id: 141abdbb59
2015-04-29 21:33:45 +00:00
Ying-Lian.Shi
a5077be6b6 ASM #17430 manifest add bundle com.ratheon.uf.common
Change-Id: I0df50f0652436dbff4762ea8ae318b9071ad322d

Former-commit-id: 1d7e10ce67 [formerly 6a6c45ce0da6ee5305e127efe57342a687d36821]
Former-commit-id: 9ad20eab53
2015-04-29 21:33:45 +00:00
Fay.Liang
fcae3d6966 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: fed9465db6 [formerly 823f71d24a [formerly 3b5e81259b] [formerly fed9465db6 [formerly 8d83603093c9283749c7fa83fca41a43c71095be]]]
Former-commit-id: 823f71d24a [formerly 3b5e81259b]
Former-commit-id: 823f71d24a
Former-commit-id: 1a6abf79b8
2015-04-29 14:21:21 -04:00
Fay.Liang
823f71d24a Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: fed9465db6 [formerly 8d83603093c9283749c7fa83fca41a43c71095be]
Former-commit-id: 3b5e81259b
2015-04-29 14:21:21 -04:00
Ron Anderson
ba2ee4790c Omaha #4027 More changes for Mixed Case
Change-Id: Id47f1c68877e8df0cbf84df09bdaa000a41a863e

Former-commit-id: 551d1bee91 [formerly 0e48bfe4de5c227ebf96b0b59f9c7a9c39415f2e]
Former-commit-id: 6b3a0d1478
2015-04-29 13:18:27 -05:00
Shawn.Hooper
ddb917338a ASM #17430 - Update Manifest file
Change-Id: I576bbbdca03198b671efa07b320ed2a652c31f5f

Former-commit-id: 4a50b7bfbf [formerly 2b121b4f0b [formerly 89091d3a6c] [formerly 4a50b7bfbf [formerly 2a5e22aa3703a7a205ca39bcaf5075f5169ad3b0]]]
Former-commit-id: 2b121b4f0b [formerly 89091d3a6c]
Former-commit-id: 2b121b4f0b
Former-commit-id: 6d88d51a06
2015-04-29 14:04:06 -04:00
Shawn.Hooper
2b121b4f0b ASM #17430 - Update Manifest file
Change-Id: I576bbbdca03198b671efa07b320ed2a652c31f5f

Former-commit-id: 4a50b7bfbf [formerly 2a5e22aa3703a7a205ca39bcaf5075f5169ad3b0]
Former-commit-id: 89091d3a6c
2015-04-29 14:04:06 -04:00
AWIPS User
7b4522cd40 bump grib decoder threads to 8; split to 4
Former-commit-id: 6447ff9e60 [formerly a3fdef38b9] [formerly bd23d82443] [formerly cff4b319116edd791c9bb00ede47e24d5e0b998c [formerly d93d861fb0b91105b2529fc0894f9dc2089cfa54] [formerly bd23d82443 [formerly 0973c23ee0]]]
Former-commit-id: cf6d70cfe857a2985b4f843f3c901316f975a242 [formerly 307d74c11b1f768d09e13f281f9dfa79df185532] [formerly adc121e5ba [formerly 99558a146c]]
Former-commit-id: adc121e5ba
Former-commit-id: 69ff01c94c
2015-04-29 09:51:34 -06:00
AWIPS User
d19e8f70ea LDM pqact and ingestGrib product updates
Former-commit-id: 4f6e2d3c7b [formerly 69461c8528] [formerly fb99a25a52] [formerly afbcd01d8a63f2058172d0b302b638981e41665b [formerly a25c50b82145c7dfae273676cc34f328bb59d1a9] [formerly fb99a25a52 [formerly 2a29315894]]]
Former-commit-id: d3685a3c74ec0e593a209609c180346fdf6323ad [formerly f366e2761ba75a73b6ac341dcaef373d4093dcb7] [formerly 9a79e57d73 [formerly 68793205ea]]
Former-commit-id: 9a79e57d73
Former-commit-id: 4ede6d34e9
2015-04-28 21:52:28 -06:00
AWIPS User
8b6c992ddd forecast models: menus and names
Former-commit-id: 4bb94e04f8 [formerly 4b87f72098] [formerly 65f6b45d4d] [formerly 0ce23374a889f69b9a368538010a41ffd760ae57 [formerly bdfcbe7a62f07dbb7dad0a823ee463b3f326122d] [formerly 65f6b45d4d [formerly 33dd7cec73]]]
Former-commit-id: 838e72f29740100842a3207c4e978b5df6a56cef [formerly 1df28483f1d2e2d5f4673d0ca790856eb6241706] [formerly 22b168b5dc [formerly 2895d9ddb6]]
Former-commit-id: 8ffec3e909c33656baf2a80cb72f210cb38a4c4a [formerly 22b168b5dc]
Former-commit-id: 7d416919bd
2015-04-28 21:42:24 -06:00
mjames-upc
5be1500200 LDM pqact and ingestGrib product updates
Former-commit-id: 940a988ac7 [formerly 0ad5759403] [formerly c779c551ca] [formerly 3e3dd518346a775adf03f5eabc7093914a6282c7 [formerly 1de9ff057fc9c0861669617590900416db26bf37] [formerly c779c551ca [formerly 3c41589061]]]
Former-commit-id: fe7922ecef140b08cf1770de02cc6dc087f3b8ab [formerly d130b42517394e3d33bac534c0ce6faa2364e28b] [formerly 877f18c243 [formerly 835f0e0f02]]
Former-commit-id: 877f18c243
Former-commit-id: ba867739be
2015-04-28 16:01:39 -06:00
Fay.Liang
188f6a389a Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 240af4fbd4 [formerly 0da589eb8d [formerly 7e0ca92095] [formerly 240af4fbd4 [formerly c8f056b03ea55db06e3d104dc15e3e787dcfdf62]]]
Former-commit-id: 0da589eb8d [formerly 7e0ca92095]
Former-commit-id: 0da589eb8d
Former-commit-id: 6852fa06c8
2015-04-28 16:46:12 -04:00
Fay.Liang
0da589eb8d Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 240af4fbd4 [formerly c8f056b03ea55db06e3d104dc15e3e787dcfdf62]
Former-commit-id: 7e0ca92095
2015-04-28 16:46:12 -04:00
Rici.Yu
64fe9d2495 ASM #17435 - Fix hibernate query syntax issue
Change-Id: I2bfd5e927fe97c3348d7366320dc535b6e67f590

Former-commit-id: 7c66a2a356 [formerly 60e9ee0bed [formerly 590af514a5] [formerly 7c66a2a356 [formerly 4c70c322956fa4a356e06e908a43b80611ae273f]]]
Former-commit-id: 60e9ee0bed [formerly 590af514a5]
Former-commit-id: 60e9ee0bed
Former-commit-id: 22f132003c
2015-04-28 16:21:43 -04:00
Rici.Yu
60e9ee0bed ASM #17435 - Fix hibernate query syntax issue
Change-Id: I2bfd5e927fe97c3348d7366320dc535b6e67f590

Former-commit-id: 7c66a2a356 [formerly 4c70c322956fa4a356e06e908a43b80611ae273f]
Former-commit-id: 590af514a5
2015-04-28 16:21:43 -04:00
AWIPS User
7779a743c1 remove subgrid files; update volume browser menus
Former-commit-id: 7aa226b78c [formerly a4199ddb85] [formerly 3eae4296f9] [formerly 510f66a8d2a27ec72281e5d08206d5d8640ea11d [formerly 13924f27bf1e52084833d7622ef8af3609b298d0] [formerly 3eae4296f9 [formerly 70ce2e57d7]]]
Former-commit-id: 978105e6576adbcc62b9423542570a8aa1f45958 [formerly f6e35d6c222d5754d20bfd7eaa858272d592f93c] [formerly f75e5a3169 [formerly 725176f853]]
Former-commit-id: f75e5a3169
Former-commit-id: b72904bfde
2015-04-28 13:16:45 -06:00
Fay.Liang
52c7642d67 Merge branch 'ops_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: d656fcc287 [formerly 664cdfb4408cecac0e4e5c6ce33d4f0b7df85164]
Former-commit-id: 77b5662f60
2015-04-27 14:10:21 -04:00
Fay.Liang
794ae0408c Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: 5919d26b63 [formerly 634a33f7265840363d11bb1068b6ceb602fba4ed]
Former-commit-id: 40a8c1f7f0
2015-04-27 14:09:40 -04:00
Fay.Liang
23d9a19b02 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: 8ecc73d1f7 [formerly 483383876bfe73eb58ec0eb314106288dab4d172]
Former-commit-id: 3d25551183
2015-04-27 14:08:47 -04:00
Fay.Liang
6253a6e91b Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: f06ed6190e [formerly 0c4b131c1dce6a545d83ca244848bf2ad887217c]
Former-commit-id: 26319e7b3e
2015-04-27 14:07:29 -04:00
Fay.Liang
85a6b063d3 Merge tag 'OB_14.3.3-7' into master_14.4.1
14.3.3-7


Former-commit-id: 8447b70f93 [formerly 8de59f59fb [formerly 6fc5cf9230] [formerly 8447b70f93 [formerly d1529f1c72bdf5a69ac611e0e93d936b6dc898f5]]]
Former-commit-id: 8de59f59fb [formerly 6fc5cf9230]
Former-commit-id: 8de59f59fb
Former-commit-id: 53eb7d8353
2015-04-27 10:20:49 -04:00
Fay.Liang
8de59f59fb Merge tag 'OB_14.3.3-7' into master_14.4.1
14.3.3-7


Former-commit-id: 8447b70f93 [formerly d1529f1c72bdf5a69ac611e0e93d936b6dc898f5]
Former-commit-id: 6fc5cf9230
2015-04-27 10:20:49 -04:00
Fay.Liang
9a8cf80fbf ASM #17424 - Fix missing data in MPE
Change-Id: Iab479a5ad9d6187363b6c097360ebc563bf9fd4b

Former-commit-id: 43049e62c7 [formerly 95dce80f43 [formerly 2f06e8830b] [formerly 43049e62c7 [formerly 45bdcaf1d1f41ef064cf4a6a95eab1655d68b3e9]]]
Former-commit-id: 95dce80f43 [formerly 2f06e8830b]
Former-commit-id: 95dce80f43
Former-commit-id: b6b61d06f5
2015-04-25 19:59:53 -04:00
Fay.Liang
95dce80f43 ASM #17424 - Fix missing data in MPE
Change-Id: Iab479a5ad9d6187363b6c097360ebc563bf9fd4b

Former-commit-id: 43049e62c7 [formerly 45bdcaf1d1f41ef064cf4a6a95eab1655d68b3e9]
Former-commit-id: 2f06e8830b
2015-04-25 19:59:53 -04:00
Shawn.Hooper
df48e28106 Merge branch 'master_14.4.1' into asm_14.4.1
Merge up to 14.4.1-28

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I94021611ed076207a6632895925f20cc0edd4888

Former-commit-id: bfeceac493 [formerly 0479064ded [formerly 1e2a6f0dcb] [formerly bfeceac493 [formerly 12eaf1024c288cfbe746d70336f13268587848ad]]]
Former-commit-id: 0479064ded [formerly 1e2a6f0dcb]
Former-commit-id: 0479064ded
Former-commit-id: 4a34651671
2015-04-24 16:27:06 -04:00
Shawn.Hooper
0479064ded Merge branch 'master_14.4.1' into asm_14.4.1
Merge up to 14.4.1-28

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I94021611ed076207a6632895925f20cc0edd4888

Former-commit-id: bfeceac493 [formerly 12eaf1024c288cfbe746d70336f13268587848ad]
Former-commit-id: 1e2a6f0dcb
2015-04-24 16:27:06 -04:00
Shawn.Hooper
7f3aa70c58 ASM #17024 - Fix bad XML merge for d2dContourStyleRules.xml and gridImageryStyleRules.xml
Change-Id: I600498d43bdc146ddb873f457f73e054c6497e5e

Former-commit-id: 1b217fc5a8 [formerly 098391a703022ae7d0e85f6cfab11ab3d8dcdfdf]
Former-commit-id: ec10118b39
2015-04-24 16:05:57 -04:00
Shawn.Hooper
00ab088465 Merge branch 'master_15.1.1' into asm_15.1.1
Former-commit-id: eb14ea888c [formerly a11fce758ca741e4f300444f08c609875f722264]
Former-commit-id: a6f5c26175
2015-04-24 15:57:40 -04:00
Shawn.Hooper
6ee7caa04f Merge branch 'master_15.1.1' into asm_15.1.1
Merges up to 15.1.1-7 back into the asm_15.1.1 branch.

Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: Ica098ffb233837e4fcb718e9c75a78de443eb267

Former-commit-id: c03499c025 [formerly 78b3f7a15c5d2ab60235f40f5236bbbbe58d28ce]
Former-commit-id: 0e6e87b762
2015-04-24 15:44:14 -04:00
AWIPS User
8118379352 RadarMenuUtil now builds from MOSAIC_RADAR (full list) rather than DIAL_RADAR
Former-commit-id: cbd36c66cc [formerly 9649d324f7] [formerly b6b737c0df] [formerly 3ab1af9a6c59c47199ff898b511b300e9aaeee40 [formerly b0de64df78c644d48e5c0533f66d028351963333] [formerly b6b737c0df [formerly 21e4ee2d0c]]]
Former-commit-id: 36641049eb0fa62b4f0d0a892acb074750c692c8 [formerly 89adfeb39c4bb6037c9565d153948f9d57a3bd35] [formerly 82d2f640d9 [formerly 6e885e0335]]
Former-commit-id: 82d2f640d9
Former-commit-id: c27ebe7056
2015-04-24 07:46:18 -06:00
Fay.Liang
e5b586edf0 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 56788f19aa [formerly 0a051ca5bd [formerly 737633b865] [formerly 56788f19aa [formerly f6e078c4124945a1169f992c6e0051569d3c5450]]]
Former-commit-id: 0a051ca5bd [formerly 737633b865]
Former-commit-id: 0a051ca5bd
Former-commit-id: 0a2f65f2b8
2015-04-23 15:55:45 -04:00
Fay.Liang
0a051ca5bd Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 56788f19aa [formerly f6e078c4124945a1169f992c6e0051569d3c5450]
Former-commit-id: 737633b865
2015-04-23 15:55:45 -04:00
Ron Anderson
beb54304de Omaha #4383 Improved logging in iscMosaic and iscDataRec
Change-Id: I2a93a46e6bb0db447ab722265f2cc14e3c957a69

Former-commit-id: 233bbf78a5 [formerly 28e7b70e9b8e495e22de71881ef9aa2932e8accf]
Former-commit-id: 9e7bb1053a
2015-04-23 13:13:40 -05:00
Jason Burks
3160b870ad VLab Issue #7704 - Fixed problem with LMADecoder decoding single level files. Added optional colormaps that would be useful for some users; Changed scaling on few parameters in image style rules; fixes #7704
Change-Id: If8599b7bf64c788063aa63e3bfc07c84a55654fd

Former-commit-id: eba4333d02 [formerly 1df3f4e987 [formerly 7164c4729d] [formerly eba4333d02 [formerly d747cb5700e68997f6b7b579d9d8f9d9698fbd8a]]]
Former-commit-id: 1df3f4e987 [formerly 7164c4729d]
Former-commit-id: 1df3f4e987
Former-commit-id: f6db1928e4
2015-04-23 10:53:53 -05:00
Jason Burks
1df3f4e987 VLab Issue #7704 - Fixed problem with LMADecoder decoding single level files. Added optional colormaps that would be useful for some users; Changed scaling on few parameters in image style rules; fixes #7704
Change-Id: If8599b7bf64c788063aa63e3bfc07c84a55654fd

Former-commit-id: eba4333d02 [formerly d747cb5700e68997f6b7b579d9d8f9d9698fbd8a]
Former-commit-id: 7164c4729d
2015-04-23 10:53:53 -05:00
Melissa Porricel
5ca1058bc3 ASM #16923 - Fix METAR decoder extra whitespace problem
Change-Id: I55ca60148f4079237876c74279ef7cb528eb6c12

Former-commit-id: 18e305efea [formerly c4ce7f8bd1bbf8e971b80f8291f67f5f7af09d46]
Former-commit-id: ebfafc7cbd
2015-04-23 10:21:52 -04:00
AWIPS User
acc3efafdb LOCAL_RADARS will not show under main menu anymore
Former-commit-id: e3d32f2f98 [formerly 26d3cfdf39] [formerly 07afa1ef0d] [formerly 1df025d45f2fd928ae54e532f511f7ae62a8d774 [formerly 13396447405d71652a5a45bdf024e2c65f3a9c5b] [formerly 07afa1ef0d [formerly 67632b57bd]]]
Former-commit-id: d313f979e4c213a7d90de436efd88561d7731f48 [formerly 8a107784ef89e4f80b84cf9d84c51f656bc40204] [formerly 4f28f24f15 [formerly 98678aa032]]
Former-commit-id: 4f28f24f15
Former-commit-id: 46f7e6bb8d
2015-04-22 17:34:42 -06:00