Robert Bailey 08e6a43c1d 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
..
api.json	Delete deprecated API versions	2015-05-29 17:17:35 -07:00
resourceListing.json	Remove v1beta3	2015-07-23 17:21:27 -07:00
v1.json	Revert "Merge pull request #9165 from smarterclayton/graceful"	2015-08-18 17:34:49 -07:00
version.json	Delete deprecated API versions	2015-05-29 17:17:35 -07:00