github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18655 from wojtek-t/versioned_list_options_in_server

Browse Source 
Switch to versioned ListOptions in server.
This commit is contained in:
Wojciech Tyczynski
2015-12-22 10:57:09 +01:00
parent 6ac2774dea 58336829be
commit e108a32b08
34 changed files with 218 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/registry/generic/etcd/etcd_test.go
View File

@@ -500,7 +500,7 @@ func TestEtcdDeleteCollection(t *testing.T) {
}
// Delete all pods.
deleted, err := registry.DeleteCollection(testContext, nil, &unversioned.ListOptions{})
deleted, err := registry.DeleteCollection(testContext, nil, &api.ListOptions{})
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
@@ -537,7 +537,7 @@ func TestEtcdDeleteCollectionWithWatch(t *testing.T) {
t.Fatalf("Unexpected error: %v", err)
}
if _, err := registry.DeleteCollection(testContext, nil, &unversioned.ListOptions{}); err != nil {
if _, err := registry.DeleteCollection(testContext, nil, &api.ListOptions{}); err != nil {
t.Fatalf("Unexpected error: %v", err)
}