7 Commits

Author	SHA1	Message	Date
Justin Huff	f49b9c2429	Fix merge conflicts	2014-06-20 09:31:18 -07:00
Nan Deng	d001110df1	gofmt -s -w -l	2014-06-19 20:59:20 +00:00
Nan Deng	2cc3a88411	unit test for GetContainerStats()	2014-06-19 20:44:53 +00:00
Nan Deng	3080262f12	unit test for cadvisor	2014-06-19 20:44:53 +00:00
Brendan Burns	d83f407e43	Fix tests.	2014-06-09 16:50:44 -07:00
Daniel Smith	c3c739d6b4	Fix spelling	2014-06-08 19:48:04 -07:00
Daniel Smith	19343c6014	Add test to kubelet, coverage up to 37%	2014-06-08 16:10:29 -07:00