Commit Graph

13 Commits (ccc04336afeec3e30f2743f65f18cbdd7fb190e5)

Author SHA1 Message Date
Daniel Smith 14e18a5308 Fix missing <- 2014-06-22 11:15:10 -07:00
Justin Huff 1441a84673 Cleanup handling of config channels in RunSyncLoop by passing a map
instead of a bunch of vars.
2014-06-22 09:32:49 -07:00
Justin Huff f49b9c2429 Fix merge conflicts 2014-06-20 09:31:18 -07:00
brendandburns 3a9a3b1114 Merge pull request #174 from monnand/kubelet-cadvisor
Letting kubelet retrieve container stats from cAdvisor
2014-06-20 08:36:22 -07:00
Nan Deng a10a64856d use json.Marshal directly 2014-06-20 04:21:57 +00:00
Nan Deng 865ba190ff write headers after error checking 2014-06-19 22:28:48 +00:00
Nan Deng 979f832a0c write StatusOK to the header after json.Encode() 2014-06-19 22:12:32 +00:00
Nan Deng 037cfd257f add /containerStats 2014-06-19 20:44:52 +00:00
Daniel Smith bc02b3c21a Rename [label] query to selector 2014-06-19 13:31:42 -07:00
Brendan Burns 164160adef Address package level comments for readability. 2014-06-12 20:26:12 -07:00
Brendan Burns 62f6291377 Fix a bug if the container is non-existent. 2014-06-09 16:45:17 -07:00
Daniel Smith 19343c6014 Add test to kubelet, coverage up to 37% 2014-06-08 16:10:29 -07:00
Joe Beda 2c4b3a562c First commit 2014-06-06 16:40:48 -07:00