Merge series in metadata #3722
Merged
Merge series in metadata #3722
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update charmrepo branch dep to charmrepo.v2-unstable, update charm.v6-unstable dep Update deps to kick off some api changes. (Review request: http://reviews.vapour.ws/r/2768/)
Add support for deploying and upgrading charms from a specified path This PR relies on an update to the charmrepo repository that is still under review. That will need to land first before this. We now support deploying a charm by specifying an arbitrary path - no local repo is needed. Such charms may be multi-series, and a new --series argument is added to allow the user to specify what series to use when deploying. When upgrading, the same series as the originally deployed charm is used. eg $ juju deploy /path/to/charm/mycharm --series trusty $ juju upgrade-charm --path /path/to/charm mycharm Juju doesn't store the path used to deploy the charm, so it needs to be specified again when upgrading. This might be revisited. A check is done to ensure the same charm directory is used (the name from metadata is being deprecated). (Review request: http://reviews.vapour.ws/r/2802/)
Merge master 0210 (Review request: http://reviews.vapour.ws/r/2818/)
Merge master 1410 (Review request: http://reviews.vapour.ws/r/2885/)
Merge naster 1510 (Review request: http://reviews.vapour.ws/r/2902/)
Local deploys/upgrades must use absolute paths; adjust status output A few changes here based on feedback from lightning talk at recent sprint. 1. deploy/upgrade from path requires absolute path, otherwise it interprets as cs charm. 2. tabular status output for machine does not show hardware string but rather just az 3. status does not show series in charm urls (series can be seen on machine info) 4. upgrade does not complain if revision file has not been edited (Review request: http://reviews.vapour.ws/r/2888/)
Merge master 0411 2 (Review request: http://reviews.vapour.ws/r/3059/)
Merge master 0911 (Review request: http://reviews.vapour.ws/r/3092/)
|
|
|
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 12, 2015
Merge series in metadata This feature branch is bless and can now be merged. (Review request: http://reviews.vapour.ws/r/3128/)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This feature branch is bless and can now be merged.
(Review request: http://reviews.vapour.ws/r/3128/)