Revert "Merge pull request #9165 from smarterclayton/graceful"

This reverts commit 4f856b595d, reversing changes made to d78525a83b. Conflicts: pkg/kubelet/status_manager.go
2015-08-18 17:34:49 -07:00
parent 301bf16792
commit 08e6a43c1d
78 changed files with 452 additions and 1494 deletions
--- a/test/integration/auth_test.go
+++ b/test/integration/auth_test.go
@@ -232,7 +232,7 @@ var deleteNow string = `
 {
  "kind": "DeleteOptions",
  "apiVersion": "` + testapi.Version() + `",
-  "gracePeriodSeconds": 0%s
+  "gracePeriodSeconds": null%s
 }
 `