Merge pull request canonical#508 from tomponline/5.0-candidate

lxd: Use different commit for cherry-pick (5.0-candidate)
tomponline · Jul 11, 2024 · 80aeff7 · 80aeff7
2 parents 3116e11 + 2cb7e37
commit 80aeff7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -1438,7 +1438,7 @@ parts:
       git cherry-pick -x 45126f2a54079799066abf6477a252605709b8e5 # shared: Set `GetClientCertificate` in TLS config.
       git cherry-pick -x 52eaf3efa780d68fa51a74d9631f3c5e7a7fc879 # shared: Add comments to exported functions (revive: exported).
       git cherry-pick -x 75fbdaeebea454fd074c9efac7a2c584a78762c7 # test/suites: Improve PKI test coverage.
-      git cherry-pick -x d406168d699a5d91f3518338ca2bfa31efdd7dd0 # lxd/instance/exec: Only use keepalives on TCP sockets
+      git cherry-pick -x ce66fe3c1404c82183711bf7e35889bf19cfd5b9 # lxd/instance/exec: Only use keepalives on TCP sockets
 
       # Setup build environment
       export GOPATH=$(realpath ./.go)