Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Default Empty Branch Name to "master" for App Settings Update #10372

Merged
merged 1 commit into from
Jun 24, 2019
Merged

Default Empty Branch Name to "master" for App Settings Update #10372

merged 1 commit into from
Jun 24, 2019

Conversation

manadart
Copy link
Member

Description of change

This patch fixes a bug whereby an older client can experience an error calling the Update method of the application API.

QA steps

  • Bootstrap this patch.
  • With an old client (LP bug raised with 2.3.8) update application settings with wither strings or YAML.
  • Observe that no error is returned.

Documentation changes

None.

Bug reference

https://bugs.launchpad.net/juju/+bug/1834017

@manadart
Copy link
Member Author

Another Branch "" Not Found

@manadart manadart changed the title Ensures that an empty branch name passed to the application API `Upda… Default Empty Branch Name to "master" for App Settings Update Jun 24, 2019
SimonRichardson
SimonRichardson approved these changes Jun 24, 2019
View reviewed changes
Copy link
Member

@SimonRichardson SimonRichardson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@manadart
Copy link
Member Author

$$merge$$

@jujubot jujubot merged commit cfa6597 into juju:2.6 Jun 24, 2019
@manadart manadart deleted the 2.6-app-config-branch-error branch June 24, 2019 13:41
@manadart manadart mentioned this pull request Jun 24, 2019
Merged
jujubot added a commit that referenced this pull request Jun 24, 2019
@jujubot
Merge pull request #10373 from manadart/2.6-into-develop
d13b59a 
#10373

## Description of change

Merge from 2.6 to bring forward:
- #10372 from manadart/2.6-app-config-branch-error
- #10368 from anastasiamac/ref-non-deprecated-update-cloud-26
- #10348 from hpidcock/1832779-command-fails-no-active-controller
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SimonRichardson SimonRichardson SimonRichardson approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@manadart @SimonRichardson @jujubot