Fix tool downloads for IAAS hosted model on CAAS #13393
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
Also fixes snap LXD config path
|
|
|
|
jujubot
added a commit
that referenced
this pull request
Oct 11, 2021
#13408 Usual conflicts, but some tricky ones around metrics. 33a867b (upstream/2.9, origin/2.9, 2.9) Merge pull request #13356 from SimonRichardson/raft-client-wireup 8712c9a (manadart/2.9, achilleasa/2.9) Merge pull request #13391 from hmlanigan/backport-metrics 9dbed19 Merge pull request #13396 from SimonRichardson/backport-mongo-4.4-fixes 7283465 Merge pull request #13389 from SimonRichardson/batching-fsm eaa218b Merge pull request #13403 from wallyworld/better-k8s-model-message 90e5368 Merge pull request #13400 from ycliuhw/enhance-ghcr f970413 Merge pull request #13394 from tlm/aws-instance-profile 526ee49 Merge pull request #13401 from jujubot/increment-to-2.9.17 b84c559 (tag: juju-2.9.16) Merge pull request #13399 from wallyworld/mongo-version-parsing 9983864 Merge pull request #13393 from hpidcock/fix-caas-iaas-tools 3d09733 Merge pull request #13386 from ycliuhw/feature/aks ## Conflicts CONFLICT (content): Merge conflict in version/version.go CONFLICT (content): Merge conflict in state/enableha.go CONFLICT (modify/delete): state/backups/restore_test.go deleted in HEAD and modified in 33a867b. Version 33a867b of state/backups/restore_test.go left in tree. CONFLICT (content): Merge conflict in snap/snapcraft.yaml CONFLICT (content): Merge conflict in scripts/win-installer/setup.iss CONFLICT (content): Merge conflict in mongo/mongodfinder_test.go CONFLICT (content): Merge conflict in mongo/mongodfinder.go CONFLICT (content): Merge conflict in go.sum CONFLICT (content): Merge conflict in go.mod CONFLICT (content): Merge conflict in feature/flags.go CONFLICT (content): Merge conflict in core/charm/repository/charmhub_test.go CONFLICT (content): Merge conflict in core/charm/repository/charmhub.go CONFLICT (content): Merge conflict in cmd/jujud/agent/agenttest/agent.go CONFLICT (content): Merge conflict in charmhub/transport/refresh.go CONFLICT (content): Merge conflict in charmhub/refresh_test.go CONFLICT (content): Merge conflict in charmhub/refresh.go CONFLICT (content): Merge conflict in apiserver/facades/controller/charmrevisionupdater/updater_test.go CONFLICT (content): Merge conflict in apiserver/facades/controller/charmrevisionupdater/updater.go CONFLICT (content): Merge conflict in apiserver/facades/controller/charmrevisionupdater/mocks/mocks.go CONFLICT (content): Merge conflict in apiserver/facades/controller/charmrevisionupdater/interface.go CONFLICT (content): Merge conflict in apiserver/facades/controller/charmrevisionupdater/charmhub.go CONFLICT (content): Merge conflict in apiserver/facades/client/application/updateseries_mocks_test.go CONFLICT (content): Merge conflict in apiserver/facades/client/application/application_test.go CONFLICT (content): Merge conflict in apiserver/facades/client/application/application.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.
QA steps
lxc remote add lxdcloud my.ip.add.ressjuju autoload-credentialsjuju add-model lxdcloud lxdcloudjuju deploy apache2(might need a custom simplestream or manually edit version/version.go to a previous version)Documentation changes
N/A
Bug reference
https://bugs.launchpad.net/juju/+bug/1943265