Merge aurora -> beta and default -> aurora

RESOLVED FIXED

Status

Mozilla QA
Mozmill Tests
RESOLVED FIXED
7 years ago
7 years ago

People

(Reporter: whimboo, Assigned: whimboo)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(2 attachments)

(Assignee)

Description

7 years ago
The merge has produced some conflicts I would like to have someone look over before I push it.
(Assignee)

Comment 1

7 years ago
Created attachment 544242 [details] [diff] [review]
Patch v1 (aurora -> beta) [checked-in]
Attachment #544242 - Flags: review?(aaron.train)
(Assignee)

Updated

7 years ago
Attachment #544242 - Attachment description: Patch v1 → Patch v1 (aurora -> beta)

Comment 2

7 years ago
A Pivotal Tracker story has been created for this Bug: https://www.pivotaltracker.com/story/show/15411799

Updated

7 years ago
Attachment #544242 - Flags: review?(aaron.train) → review+
(Assignee)

Comment 3

7 years ago
Comment on attachment 544242 [details] [diff] [review]
Patch v1 (aurora -> beta) [checked-in]

Landed as:
http://hg.mozilla.org/qa/mozmill-tests/rev/87c62777a8f0
Attachment #544242 - Attachment description: Patch v1 (aurora -> beta) → Patch v1 (aurora -> beta) [checked-in]
(Assignee)

Comment 4

7 years ago
Created attachment 544261 [details] [diff] [review]
Patch v1 (default -> aurora)
Attachment #544261 - Flags: review?(aaron.train)

Updated

7 years ago
Attachment #544261 - Flags: review?(aaron.train) → review+
(Assignee)

Comment 5

7 years ago
Merge from default -> aurora has been landed:
http://hg.mozilla.org/qa/mozmill-tests/rev/3f1adf8f901e
Status: ASSIGNED → RESOLVED
Last Resolved: 7 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.