Merge lp://staging/~cjohnston/qa-dashboard/uu into lp://staging/qa-dashboard

Proposed by Chris Johnston
Status: Merged
Approved by: Joe Talbott
Approved revision: 737
Merged at revision: 737
Proposed branch: lp://staging/~cjohnston/qa-dashboard/uu
Merge into: lp://staging/qa-dashboard
Diff against target: 121 lines (+19/-13)
3 files modified
common/utils.py (+15/-9)
smokeng/dashboard.py (+2/-2)
smokeng/management/commands/jenkins_pull_smokeng.py (+2/-2)
To merge this branch: bzr merge lp://staging/~cjohnston/qa-dashboard/uu
Reviewer Review Type Date Requested Status
Joe Talbott Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+216931@code.staging.launchpad.net

Commit message

Add Utopic Unicorn..

Description of the change

Add U and remove R

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:736
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/318/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/318/rebuild

review: Approve (continuous-integration)
Revision history for this message
Joe Talbott (joetalbott) :
review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :

Attempt to merge into lp:qa-dashboard failed due to conflicts:

text conflict in common/utils.py

737. By Chris Johnston

Fix conflicts

Revision history for this message
Joe Talbott (joetalbott) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches