Status

Firefox OS
Gaia
RESOLVED FIXED
5 years ago
4 years ago

People

(Reporter: vingtetun, Unassigned)

Tracking

(Blocks: 1 bug)

unspecified
x86_64
Linux
Dependency tree / graph

Firefox Tracking Flags

(blocking-b2g:-, b2g18+ fixed, b2g18-v1.0.0 wontfix, b2g18-v1.0.1 wontfix)

Details

(Whiteboard: [nptob])

Attachments

(1 attachment)

Created attachment 714525 [details] [diff] [review]
Patch
Attachment #714525 - Flags: review?(fabrice)
Attachment #714525 - Flags: review?(fabrice) → review+
https://github.com/mozilla-b2g/gaia/commit/a39b2d1ea69bc270ce4f616d4259679df2106ee4

I would like to upflit this. Asking tef?.
Status: NEW → RESOLVED
blocking-b2g: --- → tef?
Last Resolved: 5 years ago
Resolution: --- → FIXED
Comment on attachment 714525 [details] [diff] [review]
Patch

We need this to run perf tests on 1.0.x.
Attachment #714525 - Flags: approval-gaia-v1+
This patch had a dep on bug 812396, which is not approved for v1.0.1 and doesn't apply cleanly to v1-train.
Depends on: 812396
(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.
blocking-b2g: tef? → -
status-b2g18: --- → affected
status-b2g18-v1.0.0: --- → wontfix
status-b2g18-v1.0.1: --- → affected
tracking-b2g18: --- → +
Whiteboard: [nptob]
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>
Depends on: 840455
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.
status-b2g18-v1.0.1: affected → wontfix
Uplifted commit a39b2d1ea69bc270ce4f616d4259679df2106ee4 as:
v1-train: b673320faac2fbd478a6b79599c220ce0c9848fe
status-b2g18: affected → fixed
Blocks: 919529
You need to log in before you can comment on or make changes to this bug.