Update vendoring

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
This commit is contained in:
Arnaud Porterie 2015-08-25 10:46:43 -07:00 committed by David Calavera
parent 14d2083f14
commit c22b292719
4 changed files with 5 additions and 4 deletions

View file

@ -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

View file

@ -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

View file

@ -1,3 +1,3 @@
package fluent
const Version = "0.5.1"
const Version = "1.0.0"

View file

@ -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
}