Feature resources #4408
Merged
Feature resources #4408
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
rename show-service-resources to list-resources and remove the show-charm-resources command since it's being written in a different commit and conflicts with the alias for list-resources (Review request: http://reviews.vapour.ws/r/3777/)
change description to comment and remove comment from tabular output note that this updates the dependencies, so you'll need to rerun godeps when this lands (Review request: http://reviews.vapour.ws/r/3813/)
Merge master into feature-resources. (Review request: http://reviews.vapour.ws/r/3801/)
Conflicts:
api/service/client.go
api/service/client_test.go
apiserver/params/params.go
apiserver/service/service.go
cmd/juju/service/deploy.go
dependencies.tsv
juju/deploy.go
juju/deploy_test.go
state/state.go
Merge master into feature-resources. (Review request: http://reviews.vapour.ws/r/3836/)
Merge master into feature-resources. (Review request: http://reviews.vapour.ws/r/3847/)
…harm-resources command since it's being written in a different commit and conflicts with the alias for list-resources
Rename "juju resources" to "juju charm list-resources". A key part of this is adding the "juju charm" command. (Review request: http://reviews.vapour.ws/r/3778/)
… juju resources <unit> --details, since it was useless printing out the unit number.
Implement juju resources --details flag This adds a --details flag that does a diff of the expected resources on each unit, and the actual resources. (Review request: http://reviews.vapour.ws/r/3818/)
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
jujubot
added a commit
that referenced
this pull request
Feb 12, 2016
Feature resources
This feature branch merge into master. There are two failures seen by CI
http://reports.vapour.ws/releases/3603
and we can see these regressions came from master.
There are no outstanding bugs...there were never any bugs reported against it.
(Review request: http://reviews.vapour.ws/r/3849/)
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 merge into master. There are two failures seen by CI
http://reports.vapour.ws/releases/3603
and we can see these regressions came from master.
There are no outstanding bugs...there were never any bugs reported against it.
(Review request: http://reviews.vapour.ws/r/3849/)