Fix version for apimachinery and ugorji/go in Gopkg.toml (#1203)
This fix is an attempt to fix the issue raised #1192. The issue that a plain `dep -ensure update` fails is because the incompatibility of ugorji/go with the rest of packages (etcd, k8s etc) and the incompatibility of client-go vs. apimachinery. This fix fixed apimachinery and ugorji/go so that it is possible to use `dep -ensure update`. Previously updates has to be done individually, e.g., `dep -ensure update github.com/coreos/etcd` This fix fixes #1192. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
parent
246d896edd
commit
c6ce769fc6
6 changed files with 29 additions and 8 deletions
2
vendor/golang.org/x/sys/unix/syscall_linux_test.go
generated
vendored
2
vendor/golang.org/x/sys/unix/syscall_linux_test.go
generated
vendored
|
@ -178,7 +178,7 @@ func TestGetrlimit(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestSelect(t *testing.T) {
|
||||
_, err := unix.Select(0, nil, nil, nil, &unix.Timeval{0, 0})
|
||||
_, err := unix.Select(0, nil, nil, nil, &unix.Timeval{Sec: 0, Usec: 0})
|
||||
if err != nil {
|
||||
t.Fatalf("Select: %v", err)
|
||||
}
|
||||
|
|
6
vendor/golang.org/x/sys/unix/syscall_unix_test.go
generated
vendored
6
vendor/golang.org/x/sys/unix/syscall_unix_test.go
generated
vendored
|
@ -138,6 +138,9 @@ func TestPassFD(t *testing.T) {
|
|||
uc.Close()
|
||||
})
|
||||
_, oobn, _, _, err := uc.ReadMsgUnix(buf, oob)
|
||||
if err != nil {
|
||||
t.Fatalf("ReadMsgUnix: %v", err)
|
||||
}
|
||||
closeUnix.Stop()
|
||||
|
||||
scms, err := unix.ParseSocketControlMessage(oob[:oobn])
|
||||
|
@ -335,6 +338,9 @@ func TestDup(t *testing.T) {
|
|||
t.Fatalf("Write to dup2 fd failed: %v", err)
|
||||
}
|
||||
_, err = unix.Seek(f, 0, 0)
|
||||
if err != nil {
|
||||
t.Fatalf("Seek failed: %v", err)
|
||||
}
|
||||
_, err = unix.Read(f, b2)
|
||||
if err != nil {
|
||||
t.Fatalf("Read back failed: %v", err)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue