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

Merged
merged 1 commit into from Sep 24, 2015

Conversation

Projects
None yet
7 participants
Owner

rogpeppe commented Sep 14, 2015

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/)

Owner

urosj commented Sep 14, 2015

👍

Member

fabricematrat commented Sep 14, 2015

👍

dependencies.tsv
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
@cmars

cmars Sep 14, 2015

Owner

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

dependencies.tsv
@@ -51,4 +54,4 @@ launchpad.net/gnuflag bzr roger.peppe@canonical.com-20140716064605-pk32dnmfust02
launchpad.net/golxc bzr ian.booth@canonical.com-20141121040613-ztm1q0iy9rune3zt 13
launchpad.net/gomaasapi bzr michael.foord@canonical.com-20150703101140-oo7493pkzlzg7l6u 63
launchpad.net/gwacl bzr andrew.wilkins@canonical.com-20150811023840-kvosbu9d0kwwjfm2 245
-launchpad.net/tomb bzr gustavo@niemeyer.net-20130531003818-70ikdgklbxopn8x4 17
+launchpad.net/tomb bzr gustavo@niemeyer.net-20140529072043-hzcrlnl3ygvg914q 18
@cmars

cmars Sep 14, 2015

Owner

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

Owner

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.

Owner

rogpeppe commented Sep 14, 2015

I've reverted the mgo and tomb deps changes.

Owner

rogpeppe commented Sep 14, 2015

$$merge$$

Contributor

jujubot commented Sep 14, 2015

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

Contributor

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

Owner

rogpeppe commented Sep 24, 2015

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

Member

axw commented Sep 24, 2015

LGTM

Owner

rogpeppe commented Sep 24, 2015

$$merge$$

Contributor

jujubot commented Sep 24, 2015

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

Contributor

jujubot commented Sep 24, 2015

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

Owner

rogpeppe commented Sep 24, 2015

$$merge$$

Contributor

jujubot commented Sep 24, 2015

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

Contributor

jujubot commented Sep 24, 2015

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

Owner

rogpeppe commented Sep 24, 2015

$$merge$$

Contributor

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

Merge pull request #3275 from rogpeppe/041-use-charm.v6-unstable-again
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