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

Migrate to charm.v6-unstable and macaroon-bakery.v1. #3275

Merged

Conversation

rogpeppe
Copy link
Contributor

This is exactly #3228 re-proposed
with dependencies updated so that the tests should pass on windows
and so that no dependencies use the apparently problematic encoding
package.

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

@urosj
Copy link

urosj commented Sep 14, 2015

👍

1 similar comment
@fabricematrat
Copy link

👍

gopkg.in/macaroon.v1 git ab3940c6c16510a850e1c2dd628b919f0f3f1464 2015-01-21T11:42:31Z
gopkg.in/mgo.v2 git 3569c88678d88179dcbd68d02ab081cbca3cd4d0 2015-06-04T15:26:27Z
gopkg.in/mgo.v2 git f4923a569136442e900b8cf5c1a706c0a8b0883c 2015-08-21T15:31:23Z
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are the changes in mgo that are needed for this PR?

@cmars
Copy link
Contributor

cmars commented Sep 14, 2015

I'm a little concerned with the newer versions of mgo & tomb, since changes in those dependencies have a lot of potential for introducing side-effects elsewhere in core.

@rogpeppe rogpeppe force-pushed the 041-use-charm.v6-unstable-again branch from a5d8071 to b668aa0 Compare September 14, 2015 17:39
@rogpeppe
Copy link
Contributor Author

I've reverted the mgo and tomb deps changes.

@rogpeppe
Copy link
Contributor Author

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Sep 14, 2015

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

@jujubot
Copy link
Collaborator

jujubot commented Sep 14, 2015

Build failed: Does not match ['fixes-1494356', 'fixes-1495542', 'fixes-1494913', 'fixes-1495591', 'fixes-1494864', 'fixes-1493887', 'fixes-1494441']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/4707

@rogpeppe rogpeppe force-pushed the 041-use-charm.v6-unstable-again branch 4 times, most recently from 1360d35 to 277df20 Compare September 24, 2015 07:12
@rogpeppe
Copy link
Contributor Author

This has now been tested against CI as a feature branch and has been blessed.

@axw
Copy link
Contributor

axw commented Sep 24, 2015

LGTM

@rogpeppe
Copy link
Contributor Author

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Sep 24, 2015

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

@jujubot
Copy link
Collaborator

jujubot commented Sep 24, 2015

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

@rogpeppe rogpeppe force-pushed the 041-use-charm.v6-unstable-again branch from 277df20 to 973a8ac Compare September 24, 2015 07:52
@rogpeppe
Copy link
Contributor Author

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Sep 24, 2015

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

@jujubot
Copy link
Collaborator

jujubot commented Sep 24, 2015

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

@rogpeppe
Copy link
Contributor Author

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Sep 24, 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 Sep 24, 2015
Migrate to charm.v6-unstable and macaroon-bakery.v1.

This is exactly #3228 re-proposed
with dependencies updated so that the tests should pass on windows
and so that no dependencies use the apparently problematic encoding
package.


(Review request: http://reviews.vapour.ws/r/2655/)
@jujubot jujubot merged commit 42f7886 into juju:master Sep 24, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
7 participants