Fix/lp 1936253 #13168
Merged
Fix/lp 1936253 #13168
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
wallyworld
approved these changes
Jul 14, 2021
|
|
Merged
jujubot
added a commit
that referenced
this pull request
Jul 16, 2021
#13173 Merge 2.9 #13172 Fix azure instance queries to account for old completed deployments #13166 Add support for bespoke service principals in Azure credentials #13169 SpaceAddress conversion from single candidates instead of a slice #13162 enhance test-network-health #13168 Fix/lp 1936253 #13164 Fixes unit logging appearing on machine log #13160 State logs: index label fields #13163 CLI Deploy: Fix panic The conflicts were mainly due to removing legacy storage from Azure in develop and changing an api version. ``` Conflicts: worker/uniter/runner/jujuc/mocks/context_mock.go version/version.go tests/suites/network/network_health.sh snap/snapcraft.yaml scripts/win-installer/setup.iss provider/azure/environ_test.go provider/azure/environ.go provider/azure/config_test.go ``` ## QA steps See PRs
jujubot
added a commit
that referenced
this pull request
Jul 22, 2021
#13187 Merge from 2.9 to bring forward: - #13184 from manadart/2.9-net-info-iaas-addr-results - #13176 from SimonRichardson/juju-inspect - #13185 from SimonRichardson/logging-unmarshalling-fix - #13181 from SimonRichardson/debug-log-space-labels - #13182 from achilleasa/2.9-fix-error-in-equinix-credential-detection - #13179 from SimonRichardson/update-charm-error-messages - #13178 from manadart/2.9-k9s-no-bootstrap-series - #13175 from manadart/2.9-net-info-ingress-sort - #13174 from SimonRichardson/export-bundle-local-charms - #13170 from manadart/2.9-address-sorting - #13171 from SimonRichardson/deploy-v1-kubernetes - #13172 from wallyworld/azure-instance-lookup - #13167 from jujubot/increment-to-2.9.10 - #13169 from manadart/2.9-space-address-conversion - #13162 from hmlanigan/fix-test-network - #13166 from wallyworld/azure-bespoke-serviceprincipal - #13168 from ycliuhw/fix/lp-1936253 - #13164 from tlm/lp1933548-unit-logging - #13163 from SimonRichardson/deploy-panic-fix - #13160 from SimonRichardson/index-label-logs Conflicts resolved in: - apiserver/facades/agent/uniter/networkinfoiaas.go - core/charm/format.go - core/charm/format_test.go - go.mod - go.sum - provider/azure/config_test.go - provider/azure/environ.go - provider/azure/environ_test.go - provider/azure/environprovider.go - scripts/win-installer/setup.iss - snap/snapcraft.yaml - tests/suites/network/network_health.sh - version/version.go - worker/uniter/runner/jujuc/mocks/context_mock.go
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.
Fix Preconditions for cluster role binding deletion;
Checklist
Requires a pylibjuju changeAdded integration tests for the PRAdded or updated doc.go related to packages changedQA steps
Documentation changes
No
Bug reference
https://bugs.launchpad.net/juju/+bug/1936262