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

all: upgrade to yaml.v2 #3724

Merged
merged 2 commits into from Nov 18, 2015
Merged

all: upgrade to yaml.v2 #3724

merged 2 commits into from Nov 18, 2015

Conversation

davecheney
Copy link
Contributor

  • 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
Copy link
Contributor Author

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Nov 13, 2015

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

@jujubot
Copy link
Collaborator

jujubot commented Nov 13, 2015

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

@davecheney
Copy link
Contributor Author

$$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
Copy link
Collaborator

jujubot commented Nov 13, 2015

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

@jujubot
Copy link
Collaborator

jujubot commented Nov 13, 2015

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

Update tests expecting the previous error output.
Removes the last file from juju/juju/utils, so remove that package.
@davecheney
Copy link
Contributor Author

$$merge$$

@jujubot
Copy link
Collaborator

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
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/)
@jujubot jujubot merged commit 9d8b143 into juju:master Nov 18, 2015
@davecheney davecheney deleted the upgrade-yaml-v2 branch November 18, 2015 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants