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

2.6 - Fix Errant Branch Tracking by Cache Config Watcher #10364

Merged
merged 1 commit into from
Jun 21, 2019

Conversation

manadart
Copy link
Member

Description of change

This patch fixes an edge case in the cache charm config watcher where a unit not tracking any branch would start tracking a branch changed in the cache.

Includes some outdated comment updates.

QA steps

See new unit test; fails before, passes after.

Documentation changes

None.

Bug reference

N/A

…king a changed branch.

Includes misleading vestigial comment fixes.
@manadart
Copy link
Member Author

Copy link
Contributor

@achilleasa achilleasa 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$$

@manadart
Copy link
Member Author

Failed to start Mongo.
$$merge$$

@jujubot jujubot merged commit 56d6c10 into juju:2.6 Jun 21, 2019
@manadart manadart deleted the 2.6-config-watch-branch-determination branch June 21, 2019 12:15
jujubot added a commit that referenced this pull request Jun 22, 2019
#10367

## Description of change

Merge into develop, bringing forward:
- #10366 from manadart/2.6-cache-testing-infrastructure
- #10364 from manadart/2.6-config-watch-branch-determination
- #10362 from anastasiamac/merge-25-26-2106
- #10346 from hmlanigan/branch
- #10359 from hmlanigan/createdtomodelcache
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.

3 participants