Merge pull request #17863 from wojtek-t/only_list_options_in_watch

Auto commit by PR queue bot
2015-12-02 06:28:28 -08:00
parent cd76ca9527 d2dfc912e6
commit 8a8639d7af
77 changed files with 172 additions and 183 deletions
--- a/pkg/controller/node/nodecontroller_test.go
+++ b/pkg/controller/node/nodecontroller_test.go
@@ -136,7 +136,7 @@ func (m *FakeNodeHandler) UpdateStatus(node *api.Node) (*api.Node, error) {
 	return node, nil
 }

-func (m *FakeNodeHandler) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) {
+func (m *FakeNodeHandler) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
 	return nil, nil
 }