Yuki Sonoda (Yugui) 07b8be4d4c Merge branch 'master' into fix/golint2 ... Conflicts: pkg/api/types.go pkg/health/health_check.go pkg/kubelet/kubelet.go pkg/kubelet/kubelet_server.go pkg/kubelet/kubelet_server_test.go pkg/kubelet/kubelet_test.go		2014-07-16 21:33:21 +09:00
..
doc.go	Address package level comments for readability.	2014-06-12 20:26:12 -07:00
helper.go	Fixes golint errors in pkg/api	2014-07-08 16:08:58 +09:00
helper_test.go	Test rejection of bad JSON.	2014-06-26 19:27:56 -04:00
types.go	Update to latest cAdvisor and use data structures directly from cAdvisor	2014-07-15 11:53:00 -07:00
validation.go	Fixes golint errors in pkg/api	2014-07-15 22:56:09 +09:00
validation_test.go	Add initial validation of Service objects	2014-07-11 14:24:54 -07:00