Merged
Conversation
pengale
approved these changes
May 18, 2021
Contributor
pengale
left a comment
pengale
left a comment
There was a problem hiding this comment.
+1
Good to remove old cruft :-)
The following change removes the workaround for the 2.2.3 release and subsequent 2.3-beta1 release. As these are older releases that users should have moved away from, it's time to remove the workarounds. The code in question was highly contentious anyway, as it was never awaited on the machine, so might not have been doing what we wanted it to do in the long run.
SimonRichardson
force-pushed
the
remove-machine-workaround
branch
from
76551f8 to
b504410
Compare
Member
Author
|
|
1 similar comment
Member
Author
|
|
Member
Author
We'll keep fighting this until we work out how to fix this. |
Merged
jujubot
added a commit
that referenced
this pull request
May 26, 2021
#494 The following merges 2.9 into master. eed19e4 (upstream/2.9, origin/2.9, 2.9) Merge pull request #492 from tlm/kube-proxy-support-2 ab33f33 Merge pull request #493 from SimonRichardson/remove-machine-workaround 5c2dfa9 Merge pull request #491 from tlm/2.9.1-facades b24e750 Merge pull request #490 from tlm/kube-proxy-support-2 aaa651c Merge pull request #482 from SimonRichardson/find-parameters bde724b Merge pull request #481 from SimonRichardson/merge-master-2.9 fa1b85f Merge pull request #464 from SimonRichardson/charm-hub-url 195191b Merge pull request #463 from SimonRichardson/charm-hub-origin d6d157f Merge pull request #462 from SimonRichardson/charm-hub-find 6fab2ee Merge pull request #460 from SimonRichardson/charm-hub-info 5e61dd2 Merge pull request #459 from SimonRichardson/rename-upgrade-charm-refresh 73604c8 Merge pull request #456 from SimonRichardson/update-schema-2.9-rc3 6c0437a Merge pull request #457 from SimonRichardson/ensure-charm-store-prefix eb849e4 Merge pull request #455 from SimonRichardson/2.9 1a77394 Merge pull request #449 from achilleasa/support-new-expose-params-for-applications ad3c449 Merge pull request #448 from achilleasa/gen-2.9-beta-client
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The following change removes the workaround for the 2.2.3 release and
subsequent 2.3-beta1 release. As these are older releases that users
should have moved away from, it's time to remove the workarounds.
The code in question was highly contentious anyway, as it was never
awaited on the machine, so might not have been doing what we wanted it
to do in the long run.