github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70378 from jpbetz/remove-diff 

Remove spurious vendordiff.patch file
pull/58/head
k8s-ci-robot 2018-10-29 17:11:48 -07:00 committed by GitHub
parent dab98f9546 91096139d5
commit d265e7eeff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vendordiff.patch
View File

@ -1,25 +0,0 @@
diff -Naupr -x BUILD -x 'AUTHORS*' -x 'CONTRIBUTORS*' vendor/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go /tmp/gopath.qtqLRB/src/k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go
--- vendor/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go 2018-10-01 16:58:52.811248049 -0700
+++ /tmp/gopath.qtqLRB/src/k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go 2018-10-01 16:55:15.000000000 -0700
@@ -189,7 +189,7 @@ func configureTestCluster(t *testing.T,
// launch will attempt to start the etcd server
func (m *EtcdTestServer) launch(t *testing.T) error {
var err error
- if m.s, err = etcdserver.NewServer(m.ServerConfig); err != nil {
+ if m.s, err = etcdserver.NewServer(&m.ServerConfig); err != nil {
return fmt.Errorf("failed to initialize the etcd server: %v", err)
}
m.s.SyncTicker = time.NewTicker(500 * time.Millisecond)
@@ -297,7 +297,7 @@ func NewUnsecuredEtcd3TestClientServer(t
Prefix: etcdtest.PathPrefix(),
ServerList: server.V3Client.Endpoints(),
DeserializationCacheSize: etcdtest.DeserializationCacheSize,
- Paging: true,
+ Paging: true,
}
return server, config
}
Only in vendor/k8s.io/apiserver/pkg/storage/etcd3: 127.0.0.1:21001114727
Only in vendor/k8s.io/apiserver/pkg/storage/etcd3: 127.0.0.1:21002114727
Only in vendor/k8s.io/apiserver/pkg/storage/etcd3: localhost:7941259886567686464
Only in vendor/k8s.io/apiserver/pkg/storage/etcd3: localhost:79412598865676864640