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.

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

Merge forward master -> 2.7 #356

Merged
merged 4 commits into from Sep 5, 2019
Merged

Conversation

SimonRichardson
Copy link
Member

Making new changes in master (2.6) to 2.7 branch.

SimonRichardson and others added 4 commits September 5, 2019 11:30
The following ensures that we handle missing data returned back
from the new API. Although the new API isn't turned on in this
branch, we should at least handle the case where it could be.
The following cleans up the formatting if there is empty endpoints
juju#355

The following ensures that we handle missing data returned back
from the new API. Although the new API isn't turned on in this
branch, we should at least handle the case where it could be.
@SimonRichardson
Copy link
Member Author

$$merge$$

@jujubot jujubot merged commit f8d218a into juju:2.7 Sep 5, 2019
@SimonRichardson SimonRichardson deleted the merge-forward branch September 5, 2019 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants