Created attachment 714525 [details] [diff] [review] Patch
https://github.com/mozilla-b2g/gaia/commit/a39b2d1ea69bc270ce4f616d4259679df2106ee4 I would like to upflit this. Asking tef?.
Comment on attachment 714525 [details] [diff] [review] Patch We need this to run perf tests on 1.0.x.
This patch had a dep on bug 812396, which is not approved for v1.0.1 and doesn't apply cleanly to v1-train.
(In reply to John Ford [:jhford] from comment #3) > This patch had a dep on bug 812396, which is not approved for v1.0.1 and > doesn't apply cleanly to v1-train. Approved bug 812396 for v1.0.1 as well as this one since they are npotb and we'll get perf test wins.
Commit a39b2d1ea69bc270ce4f616d4259679df2106ee4 does not apply to v1-train. This means that there are merge conflicts which need to be resolved. If there are dependencies that are not approved for branch landing, or have yet to land on master, please let me know If a manual merge is required, a good place to start might be: cd gaia git checkout v1-train git cherry-pick -x -m1 a39b2d1ea69bc270ce4f616d4259679df2106ee4 <RESOLVE MERGE CONFLICTS>
Waiting for Bug 837111 and Bug 840455 to be uplifted. Also per Bug 837111 comment 27 this won't go to v1.0.1 after all.
Uplifted commit a39b2d1ea69bc270ce4f616d4259679df2106ee4 as: v1-train: b673320faac2fbd478a6b79599c220ce0c9848fe
4 years ago