Brian Grant 984bc8d5f6 Merge pull request #5635 from ravigadde/master ... Add timeout to kubelet client		2015-03-26 14:55:24 -07:00
..
app	Merge pull request #5635 from ravigadde/master	2015-03-26 14:55:24 -07:00
apiserver.go	move pkg/master/server to cmd/kube-apiserver/app	2015-02-20 08:49:12 -08:00