Skip to content

Commit

Permalink
Downgrade siruspen/logrus from 1.4.2
Browse files Browse the repository at this point in the history
The upgrade of logrus forces to update the dependency in go module
consumers as well.

The new locking in logrus 1.5.0 introduces regressions in conjunction to
deadlocks when using custom hooks, which is the case in CRI-O for
example.
Having it point to v1.5.0 here is forcing cri-o to upgrade it as well
when we update c/buildah to v1.14.6.

Let's downgrade logrus till sirupsen/logrus#1122
is fixed.

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
  • Loading branch information
umohnani8 committed Apr 6, 2020
1 parent 31a01b4 commit deb253f
Show file tree
Hide file tree
Showing 379 changed files with 38,939 additions and 93,215 deletions.
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ go 1.12

require (
github.com/containernetworking/cni v0.7.2-0.20190904153231-83439463f784
github.com/containers/common v0.7.0
github.com/containers/image/v5 v5.3.1
github.com/containers/storage v1.18.0
github.com/containers/common v0.8.1
github.com/containers/image/v5 v5.4.1
github.com/containers/storage v1.18.2
github.com/cyphar/filepath-securejoin v0.2.2
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/go-units v0.4.0
github.com/docker/libnetwork v0.8.0-dev.2.0.20190625141545-5a177b73e316
github.com/etcd-io/bbolt v1.3.3
Expand All @@ -31,11 +30,12 @@ require (
github.com/pkg/errors v0.9.1
github.com/seccomp/containers-golang v0.0.0-20190312124753-8ca8945ccf5f
github.com/seccomp/libseccomp-golang v0.9.1
github.com/sirupsen/logrus v1.5.0
github.com/sirupsen/logrus v1.4.2
github.com/spf13/cobra v0.0.7
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.5.1
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
golang.org/x/sys v0.0.0-20200217220822-9197077df867
github.com/vishvananda/netlink v1.1.0 // indirect
golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59
golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775
)
141 changes: 112 additions & 29 deletions go.sum

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions vendor/github.com/containers/common/pkg/apparmor/apparmor.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

289 changes: 289 additions & 0 deletions vendor/github.com/containers/common/pkg/apparmor/apparmor_linux.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit deb253f

Please sign in to comment.