Merge ~nacc/git-ubuntu:lp1710035-lint-return-to-head into git-ubuntu:master

Proposed by Nish Aravamudan
Status: Merged
Approved by: Nish Aravamudan
Approved revision: 18344ec4a2723c84697061f8338e987741771ab8
Merged at revision: 390621ec89ed32eac18e84fd4c73274719db27b4
Proposed branch: ~nacc/git-ubuntu:lp1710035-lint-return-to-head
Merge into: git-ubuntu:master
Diff against target: 88 lines (+22/-8) (has conflicts)
1 file modified
gitubuntu/lint.py (+22/-8)
Conflict in gitubuntu/lint.py
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Needs Fixing
Nish Aravamudan Approve
Andreas Hasenack Approve
Review via email: mp+330632@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:58409e97e661b111b3cc0d49ff70f8c14feba54c
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nacc/usd-importer/+git/usd-importer/+merge/330632/+edit-commit-message

https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/74/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Style Check

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/74/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:b36152cdb60438557d95458a8908a3569bc3161e
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nacc/usd-importer/+git/usd-importer/+merge/330632/+edit-commit-message

https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/75/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/75/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:dce89408028bab23065f5f6ecf5cb2c2fb59787e
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nacc/usd-importer/+git/usd-importer/+merge/330632/+edit-commit-message

https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/78/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/78/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

+1, nice cleanup. Tests pass. Note that launchpad is showing what looks like a merge conflict in the displayed diff, I don't know what that is about.

review: Approve
Revision history for this message
Nish Aravamudan (nacc) :
review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:18344ec4a2723c84697061f8338e987741771ab8
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nacc/usd-importer/+git/usd-importer/+merge/330632/+edit-commit-message

https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/79/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/79/rebuild

review: Needs Fixing (continuous-integration)

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

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