[2.9] Fix broken centos proxy tests part2 #12755
Merged
Conversation
This file contains 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
hmlanigan
approved these changes
Mar 11, 2021
|
|
Merged
jujubot
added a commit
that referenced
this pull request
Mar 16, 2021
#12770 Merge 2.9 #12735 Silences proxy log messages from klog #12742 Fixes broken kubeconfig loading tests #12754 Record hostname when machine agent starts #12755 Fix broken centos proxy tests part2 #12756 Update github.com/juju/charm/v7 to include v2 block #12757 Disable tests/run.sh for released bundle test and dump logs #12739 Scaffold upgrade series logic #12753 Disregard refcount for blobstore cleanup #12758 No panic missing bundle app body #12759 Fix errant relative timeout for migration minion reports #12760 Include hostname in multi-watcher machine deltas #12750 Refactor series support to that juju itself can set its own supported series ``` # Conflicts: # apiserver/allfacades.go # apiserver/facades/agent/machine/machiner.go # apiserver/facades/client/client/client.go # apiserver/facades/schema.json # caas/kubernetes/provider/cloud.go # cloudconfig/userdatacfg_unix.go # cmd/juju/commands/bootstrap_test.go # state/migration_internal_test.go ``` ## QA steps See PRs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR skips a few additional tests (windows/centos) that were missed by the changeset in #12746.