From c22b292719b443ff2fcac646aa263d5a5b10025e Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Tue, 25 Aug 2015 10:46:43 -0700 Subject: [PATCH] Update vendoring Signed-off-by: Arnaud Porterie --- hack/vendor.sh | 2 +- .../github.com/fluent/fluent-logger-golang/fluent/fluent.go | 3 ++- .../github.com/fluent/fluent-logger-golang/fluent/version.go | 2 +- .../opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index 3291e6d23f..d3025171b3 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -43,7 +43,7 @@ clone git github.com/endophage/gotuf a592b03b28b02bb29bb5878308fb1abed63383b5 clone git github.com/tent/canonical-json-go 96e4ba3a7613a1216cbd1badca4efe382adea337 clone git github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c -clone git github.com/opencontainers/runc v0.0.2 # libcontainer +clone git github.com/opencontainers/runc v0.0.2.1 # libcontainer # libcontainer deps (see src/github.com/docker/libcontainer/update-vendor.sh) clone git github.com/coreos/go-systemd v2 clone git github.com/godbus/dbus v2 diff --git a/vendor/src/github.com/fluent/fluent-logger-golang/fluent/fluent.go b/vendor/src/github.com/fluent/fluent-logger-golang/fluent/fluent.go index f746c51266..ce65cae639 100644 --- a/vendor/src/github.com/fluent/fluent-logger-golang/fluent/fluent.go +++ b/vendor/src/github.com/fluent/fluent-logger-golang/fluent/fluent.go @@ -3,6 +3,7 @@ package fluent import ( "errors" "fmt" + "io" "math" "net" "reflect" @@ -33,7 +34,7 @@ type Config struct { type Fluent struct { Config - conn net.Conn + conn io.WriteCloser pending []byte reconnecting bool mu sync.Mutex diff --git a/vendor/src/github.com/fluent/fluent-logger-golang/fluent/version.go b/vendor/src/github.com/fluent/fluent-logger-golang/fluent/version.go index 4ee1555799..135e1e51af 100644 --- a/vendor/src/github.com/fluent/fluent-logger-golang/fluent/version.go +++ b/vendor/src/github.com/fluent/fluent-logger-golang/fluent/version.go @@ -1,3 +1,3 @@ package fluent -const Version = "0.5.1" +const Version = "1.0.0" diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go b/vendor/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go index 1954357b6c..ef0cfb8194 100644 --- a/vendor/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go +++ b/vendor/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go @@ -236,7 +236,7 @@ func getCgroupData(c *configs.Cgroup, pid int) (*data, error) { } func (raw *data) parent(subsystem, mountpoint, src string) (string, error) { - initPath, err := cgroups.GetInitCgroupDir(subsystem) + initPath, err := cgroups.GetThisCgroupDir(subsystem) if err != nil { return "", err }