Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove file that was inadvertently added #1399

Merged
merged 1 commit into from Jan 14, 2015
Merged

Remove file that was inadvertently added #1399

merged 1 commit into from Jan 14, 2015

Conversation

johnweldon
Copy link
Contributor

This file was accidentally added

(Review request: http://reviews.vapour.ws/r/720/)

@dimitern
Copy link

LGTM

@binary132
Copy link
Contributor

$$shipit$$

@jujubot
Copy link
Collaborator

jujubot commented Jan 13, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot
Copy link
Collaborator

jujubot commented Jan 13, 2015

Build failed: Does not match ['fixes-1409827']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/1791

@binary132
Copy link
Contributor

$$shipit$$

@jujubot
Copy link
Collaborator

jujubot commented Jan 14, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot
Copy link
Collaborator

jujubot commented Jan 14, 2015

Build failed: Does not match ['fixes-1409827']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/1795

@johnweldon
Copy link
Contributor Author

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Jan 14, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot
Copy link
Collaborator

jujubot commented Jan 14, 2015

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/1817

@johnweldon
Copy link
Contributor Author

This seems unrelated:

megawatcher_internal_test.go:1014:
    s.Reset(c)
megawatcher_internal_test.go:69:
    c.Assert(err, jc.ErrorIsNil)
... value *errors.Err = &errors.Err{message:"", cause:(*net.OpError)(0xc21034f680), previous:(*errors.Err)(0xc2103b25a0), file:"github.com/juju/juju/state/open.go", line:68} ("cannot create log collection: local error: bad record MAC: local error: bad record MAC")
... error stack:
    local error: bad record MAC
    github.com/juju/juju/state/open.go:189: cannot create log collection: local error: bad record MAC
    github.com/juju/juju/state/open.go:57: 
    github.com/juju/juju/state/open.go:68: 

$$retry$$

@jujubot
Copy link
Collaborator

jujubot commented Jan 14, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

jujubot added a commit that referenced this pull request Jan 14, 2015
Remove file that was inadvertently added

This file was accidentally added

(Review request: http://reviews.vapour.ws/r/720/)
@jujubot jujubot merged commit 84d7402 into juju:master Jan 14, 2015
@johnweldon johnweldon deleted the remove-accidental-add branch January 14, 2015 14:07
@johnweldon johnweldon restored the remove-accidental-add branch January 14, 2015 14:08
@johnweldon johnweldon deleted the remove-accidental-add branch January 14, 2015 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants