/juju

Add constraints to show-machine output #6762

Merged
merged 2 commits into from Jan 4, 2017

Conversation

Reviewers

@voidspace voidspace

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@macgreagoir @voidspace @jujubot
@macgreagoir
Contributor

macgreagoir commented Jan 4, 2017

Fixes lp:1650258

QA steps:

  • Bootstrap with constraints
  • juju show-machine 0 -m controller should include a constraints item, similarly formatted to the hardware item
  • --format json and juju status, with yaml or json format, should also include the constraints item
@voidspace

voidspace commented Jan 4, 2017

LGTM
@macgreagoir
Contributor

macgreagoir commented Jan 4, 2017

!!build!!
@macgreagoir
Contributor

macgreagoir commented Jan 4, 2017

!!build!!
@macgreagoir
Contributor

macgreagoir commented Jan 4, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Jan 4, 2017

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

@jujubot jujubot merged commit 46205ba into juju:develop Jan 4, 2017
1 check passed

1 check passed

github-check-merge-juju Built PR, ran unit tests, and tested LXD deploy. Use !!.*!! to request another build. IE, !!build!!, !!retry!!
Details

macgreagoir added a commit to macgreagoir/juju that referenced this pull request Jan 5, 2017

@jujubot @macgreagoir
Merge pull request #6762 from macgreagoir/show-machine-constraints 
Add constraints to show-machine output

Fixes lp:1650258

QA steps:
 * Bootstrap with constraints
 * `juju show-machine 0 -m controller` should include a constraints item, similarly formatted to the hardware item
 * `--format json` and `juju status`, with yaml or json format, should also include the constraints item
332a7f6

jujubot added a commit that referenced this pull request Jan 5, 2017

@jujubot
Merge pull request #6768 from macgreagoir/show-machine-constraints-2.1 
Merge pull request #6762 from macgreagoir/show-machine-constraints

Add constraints to show-machine output

Fixes lp:1650258

QA steps:
 * Bootstrap with constraints
 * `juju show-machine 0 -m controller` should include a constraints item, similarly formatted to the hardware item
 * `--format json` and `juju status`, with yaml or json format, should also include the constraints item
6f6171f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment