Remove file that was inadvertently added #1399

Merged
merged 1 commit into from Jan 14, 2015

Conversation

Projects
None yet
4 participants
Contributor

johnweldon commented Jan 13, 2015

This file was accidentally added

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

Contributor

dimitern commented Jan 13, 2015

LGTM

Contributor

binary132 commented Jan 13, 2015

$$shipit$$

Contributor

jujubot commented Jan 13, 2015

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

Contributor

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

Contributor

binary132 commented Jan 14, 2015

$$shipit$$

Contributor

jujubot commented Jan 14, 2015

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

Contributor

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

Contributor

johnweldon commented Jan 14, 2015

$$merge$$

Contributor

jujubot commented Jan 14, 2015

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

Contributor

jujubot commented Jan 14, 2015

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

Contributor

johnweldon commented Jan 14, 2015

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$$

Contributor

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

Merge pull request #1399 from johnweldon/remove-accidental-add
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 johnweldon:remove-accidental-add branch Jan 14, 2015

@johnweldon johnweldon restored the johnweldon:remove-accidental-add branch Jan 14, 2015

@johnweldon johnweldon deleted the johnweldon:remove-accidental-add branch Jan 14, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment