Skip to content

Commit

Permalink
Merge pull request juju#17011 from benhoyt/pebble-v1.7.3
Browse files Browse the repository at this point in the history
juju#17011

This is to pull in this Pebble fix to the Juju 3.4 branch: canonical/pebble#363. It fixes an issue a couple of people have had with adding and merging layers (described in canonical/pebble#349).
  • Loading branch information
jujubot authored Mar 6, 2024
2 parents 9beea2e + 5c7817a commit e505941
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ require (
github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f
github.com/canonical/go-dqlite v1.21.0
github.com/canonical/lxd v0.0.0-20231214113525-e676fc63c50a
github.com/canonical/pebble v1.7.2
github.com/canonical/pebble v1.7.3
github.com/chzyer/readline v1.5.1
github.com/coreos/go-systemd/v22 v22.5.0
github.com/docker/distribution v2.8.3+incompatible
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ github.com/canonical/go-flags v0.0.0-20230403090104-105d09a091b8 h1:zGaJEJI9qPVy
github.com/canonical/go-flags v0.0.0-20230403090104-105d09a091b8/go.mod h1:ZZFeR9K9iGgpwOaLYF9PdT44/+lfSJ9sQz3B+SsGsYU=
github.com/canonical/lxd v0.0.0-20231214113525-e676fc63c50a h1:Tfo/MzXK5GeG7gzSHqxGeY/669Mhh5ea43dn1mRDnk8=
github.com/canonical/lxd v0.0.0-20231214113525-e676fc63c50a/go.mod h1:UxfHGKFoRjgu1NUA9EFiR++dKvyAiT0h9HT0ffMlzjc=
github.com/canonical/pebble v1.7.2 h1:yuMoMzBaIhnpBbDal5V6ljSEPzgQkuiolovhOwlQgH0=
github.com/canonical/pebble v1.7.2/go.mod h1:bROzibw902Vastd13S/H48BrVAjEUKnlRXv3ZIoFcPE=
github.com/canonical/pebble v1.7.3 h1:fpK/ut6FlNOjqqQ+9DjNSw43L4wl2aFMgRZGmAoHmnY=
github.com/canonical/pebble v1.7.3/go.mod h1:bROzibw902Vastd13S/H48BrVAjEUKnlRXv3ZIoFcPE=
github.com/canonical/x-go v0.0.0-20230522092633-7947a7587f5b h1:Da2fardddn+JDlVEYtrzBLTtyzoyU3nIS0Cf0GvjmwU=
github.com/canonical/x-go v0.0.0-20230522092633-7947a7587f5b/go.mod h1:upTK9n6rlqITN9rCN69hdreI37dRDFUk2thlGGD5Cg8=
github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
Expand Down

0 comments on commit e505941

Please sign in to comment.