4 commits

Author	SHA1	Message	Date
Zefan Li	f4c0d06103	Fix sysinfo regression ... The cleanup to sysinfo package introduced a regression. If memory cgroup isn't supported and --memory is specified when starting a container, we should return info instead of nil in checkCgroupMem(), otherwise we'll access a nil pointer. Signed-off-by: Zefan Li <lizefan@huawei.com>	2015-06-19 09:44:23 +08:00
Brian Goff	d89616fb64	cleanup sysinfo package ... Signed-off-by: Brian Goff <cpuguy83@gmail.com>	2015-06-17 20:41:14 -04:00
Lei Jitang	ba8bb0c1d7	Add bridge-nf-call-iptables/bridge-nf-call-ipv6tables to docker info ... Signed-off-by: Lei Jitang <leijitang@huawei.com>	2015-06-17 09:19:11 +08:00
John Howard	e34cec1021	Windows: Refactor sysinfo for compilation ... Signed-off-by: John Howard <jhoward@microsoft.com>	2015-05-14 09:44:51 -07:00