/juju

all: upgrade to yaml.v2 #3724

Merged
merged 2 commits into from Nov 18, 2015

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@davecheney @jujubot
@davecheney
Contributor

davecheney commented Nov 13, 2015

  • utils: switch to yaml.v2
    Update tests expecting the previous error output.
  • all: remove juju/utils.go yaml fork, revert to juju/utils repo
    Removes the last file from juju/juju/utils, so remove that package.

(Review request: http://reviews.vapour.ws/r/3130/)
@davecheney
Contributor

davecheney commented Nov 13, 2015

$$merge$$
@jujubot
Contributor

jujubot commented Nov 13, 2015

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

jujubot commented Nov 13, 2015

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/5423
@davecheney
Contributor

davecheney commented Nov 13, 2015

$$merge$$

On Fri, Nov 13, 2015 at 3:22 PM, Juju bot notifications@github.com wrote:

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/5423

—
Reply to this email directly or view it on GitHub
#3724 (comment).
@jujubot
Contributor

jujubot commented Nov 13, 2015

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

jujubot commented Nov 13, 2015

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/5431

davecheney added some commits Nov 13, 2015

@davecheney
utils: switch to yaml.v2 
Update tests expecting the previous error output.
14132c7
@davecheney
all: remove juju/utils.go yaml fork, revert to juju/utils repo 
Removes the last file from juju/juju/utils, so remove that package.
d0cb1b7
@davecheney
Contributor

davecheney commented Nov 18, 2015

$$merge$$
@jujubot
Contributor

jujubot commented Nov 18, 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 Nov 18, 2015

@jujubot
Merge pull request #3724 from davecheney/upgrade-yaml-v2 
all: upgrade to yaml.v2

- utils: switch to yaml.v2
  Update tests expecting the previous error output.
- all: remove juju/utils.go yaml fork, revert to juju/utils repo
  Removes the last file from juju/juju/utils, so remove that package.


(Review request: http://reviews.vapour.ws/r/3130/)
9d8b143

@jujubot jujubot merged commit 9d8b143 into juju:master Nov 18, 2015

@davecheney davecheney deleted the davecheney:upgrade-yaml-v2 branch Nov 18, 2015

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