Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Fix breakage that occurred adding get for a region #6462
Conversation
|
$$merge$$ |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
jujubot
merged commit 7a14a0f
into
juju:develop
Oct 17, 2016
1 check passed
github-check-merge-juju
Built PR, ran unit tests, and tested LXD deploy.
Details
reedobrien
deleted the
reedobrien:lp/1634197_reset-get-output
branch
Oct 17, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
reedobrien commentedOct 17, 2016
Ensure we aren't resetting and getting at the same time -- which is
invalid. When adding the feature to allow getting all settings
for a specific region we removed the check to see if reset was set and
prevent also setting getConfig from being called in Run. This fixes the
issue by putting the appropriate check in place and adding tests to
ensure there is no stdout when resetting.
Fixes: lp:1634197
QA:
juju bootstrap awstest reed/aws/us-west-1a controller in a cloud with regions, using a config like; awstest herejuju model-defaultsjuju model-defaults us-east-1juju model-defaults --reset ftp-proxy us-east-1# no outputjuju model-defaults --reset ftp-proxy# no outputjuju model-defaults --reset no-proxy us-east-1# no outputjuju model-defaults us-east-1ERROR there are no default model values in region "us-east-1"juju model-defaults us-east-1 no-proxyERROR there are no default model values for "no-proxy" in region "us-east-1"