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

Increment juju to 2.9.7 #13095

Merged
merged 1 commit into from
Jun 22, 2021
Merged

Increment juju to 2.9.7 #13095

merged 1 commit into from
Jun 22, 2021

Conversation

jujubot
Copy link
Collaborator

@jujubot jujubot commented Jun 21, 2021

No description provided.

@jujubot
Copy link
Collaborator Author

jujubot commented Jun 21, 2021

Can one of the admins verify this patch?

3 similar comments
@jujubot
Copy link
Collaborator Author

jujubot commented Jun 21, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator Author

jujubot commented Jun 21, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator Author

jujubot commented Jun 21, 2021

Can one of the admins verify this patch?

@hpidcock
Copy link
Member

$$merge$$

@hpidcock hpidcock added the 2.9 label Jun 22, 2021
@jujubot jujubot merged commit e9fd5a1 into juju:2.9 Jun 22, 2021
jujubot added a commit that referenced this pull request Jun 28, 2021
#13109

Merge from 2.9 to bring forward:
- #13103 from manadart/2.9-lxd-spec-assignment
- #13105 from ycliuhw/fix/lp-1929904
- #13106 from SimonRichardson/update-http-dep
- #13100 from tlm/model-operator-29-upgrade
- #13102 from manadart/2.9-lxd-with-proxy
- #13099 from SimonRichardson/updating-packaging-dep
- #13096 from ycliuhw/lp-1927656
- #13101 from hpidcock/aws-encrypted-ebs
- #13073 from tlm/LP1930798-juju-2.9-k8s-upgrade-2
- #13078 from hmlanigan/sidecar-charm-via-bundle
- #13098 from achilleasa/2.9-logsink-error-if-persisting-logs-to-db-fails
- #13091 from wallyworld/use-aws-sdk-v2
- #13095 from jujubot/increment-to-2.9.7

Conflicts:
- caas/kubernetes/provider/export_test.go
- cmd/juju/application/deployer/bundlehandler.go
- cmd/juju/application/deployer/deployer.go
- core/bundle/changes/handlers.go
- core/charm/computedseries.go
- go.mod
- go.sum
- scripts/win-installer/setup.iss
- snap/snapcraft.yaml
- version/version.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants