Daniel Smith d02139d2b4 Merge pull request #6771 from derekwaynecarr/ns_controller ... Remove delay when deleting namespaces, move to new controller framework		2015-04-13 17:55:13 -07:00
..
controllermanager.go	Merge pull request #6771 from derekwaynecarr/ns_controller	2015-04-13 17:55:13 -07:00
plugins.go	move pkg/controllermanager to cmd/kube-controller-manager/app	2015-02-20 08:49:12 -08:00