4 Commits

Author	SHA1	Message	Date
Baohua Yang	71f0f50f27	Merge branch 'master' of https://github.com/cxjava/docker_practice into cxjava-master ... Conflicts: security/control_group.md security/daemon_sec.md security/kernel_capability.md security/kernel_ns.md	2014-09-22 10:04:22 +08:00
Baohua Yang	8c59d79c5b	rewrite the daemon part	2014-09-21 21:44:55 +08:00
Charles	96b199aae2	Fixed the wrong Chinese character 2	2014-09-21 20:50:55 +08:00
Baohua Yang	49c4143e27	rename	2014-09-21 13:50:34 +08:00