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

Securely handle /etc/snap.assertions #13314

Merged
merged 1 commit into from Sep 9, 2021
Merged

Securely handle /etc/snap.assertions #13314

merged 1 commit into from Sep 9, 2021

Conversation

simondeziel
Copy link
Contributor

@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

12 similar comments
@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

@jujubot
Copy link
Collaborator

jujubot commented Sep 7, 2021

Can one of the admins verify this patch?

@wallyworld wallyworld changed the base branch from develop to 2.9 September 8, 2021 02:34
@wallyworld wallyworld changed the base branch from 2.9 to develop September 8, 2021 02:35
@wallyworld
Copy link
Member

Thanks for the patch, can you please rebase and target at the 2.9 branch

Signed-off-by: Simon Deziel <simon@sdeziel.info>
@simondeziel simondeziel changed the base branch from develop to 2.9 September 8, 2021 17:49
@simondeziel
Copy link
Contributor Author

@wallyworld should be better now, please let me know if I missed something, thanks!

@wallyworld
Copy link
Member

$$merge$$

@wallyworld
Copy link
Member

!!build!!

@wallyworld wallyworld merged commit 1048ade into juju:2.9 Sep 9, 2021
@achilleasa achilleasa mentioned this pull request Sep 13, 2021
jujubot added a commit that referenced this pull request Sep 13, 2021
#13329

This PR forward ports 2.9 into develop. The following PRs are included in this port:
 - Merge pull request #13324 from achilleasa/2.9-add-ovs-integration-test
 - Merge pull request #13328 from manadart/2.9-assess-series-upgrade
 - Merge pull request #13327 from wallyworld/azure-tests-fix
 - Merge pull request #13325 from SimonRichardson/raft-worker-errors
 - Merge pull request #13274 from SimonRichardson/lxd-network-devices-config-host-name
 - Merge pull request #13323 from jujubot/increment-to-2.9.15
 - Merge pull request #13321 from wallyworld/more-secret-metadata
 - Merge pull request #13319 from manadart/2.9-bridge-policy
 - Merge pull request #13320 from SimonRichardson/revert-lxd-changes
 - Merge pull request #13194 from juanmanuel-tirado/patch-1
 - Merge pull request #13318 from hpidcock/fix-1942948
 - Merge pull request #13314 from simondeziel/snap-ack
 - Merge pull request #13297 from achilleasa/2.9-allow-empty-openvswitch-blocks-in-netplan-config
 - Merge pull request #13317 from jujubot/increment-to-2.9.14
 - Merge pull request #13316 from hpidcock/fix-1942948
 - Merge pull request #13296 from ycliuhw/fix/registry-oauth2
 - Merge pull request #13311 from wallyworld/unitagent-missing-charm
 - Merge pull request #13315 from wallyworld/lxd-not-found-fix
 - Merge pull request #13221 from juanmanuel-tirado/status_watch_flag
 - Merge pull request #13312 from wallyworld/remove-txnwatcher-started
 - Merge pull request #13309 from kot0dama/fix-instrospection-posix-shell-2.9

The following files had merge conflicts that had to be resolved (please double-check the changes in last commit):
- caas/kubernetes/provider/bootstrap_test.go
- feature/flags.go
- scripts/win-installer/setup.iss
- snap/snapcraft.yaml
- state/pool.go
- version/version.go
- worker/uniter/relation/state_test.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
4 participants