Merge pull request #19307 from caesarxuchao/remove-namespaceifscoped

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-13 11:01:54 -08:00
24 changed files with 31 additions and 31 deletions

View File

@@ -161,7 +161,7 @@ var deleteCollectionTemplate = `
// DeleteCollection deletes a collection of objects.
func (c *$.type|privatePlural$) DeleteCollection(options *$.apiDeleteOptions|raw$, listOptions $.apiListOptions|raw$) error {
return c.client.Delete().
NamespaceIfScoped(c.ns, len(c.ns) > 0).
Namespace(c.ns).
Resource("$.type|privatePlural$").
VersionedParams(&listOptions, api.Scheme).
Body(options).

View File

@@ -92,7 +92,7 @@ func (c *testTypes) Delete(name string, options *api.DeleteOptions) error {
// DeleteCollection deletes a collection of objects.
func (c *testTypes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
return c.client.Delete().
NamespaceIfScoped(c.ns, len(c.ns) > 0).
Namespace(c.ns).
Resource("testTypes").
VersionedParams(&listOptions, api.Scheme).
Body(options).