10 commits

Author	SHA1	Message	Date
Michael Crosby	0cecc2a78c	Merge branch 'master' into 0.6.5-dm-plugin ... Conflicts: container.go image.go	2013-11-21 17:18:41 -08:00
Guillaume J. Charmes	33e70864a2	Refactor State to be 100% thread safe	2013-11-21 16:34:58 -08:00
Michael Crosby	2382a0f920	Merge branch 'master' into 0.6.5-dm-plugin ... Conflicts: server.go	2013-11-20 11:07:42 -08:00
Guillaume J. Charmes	12e993549d	Fix unit-tests	2013-11-19 15:24:14 -08:00
Guillaume J. Charmes	28d4cbbc59	Merge branch 'master' into creack-merge-master ... Conflicts: api_params.go graph.go graph_test.go image.go integration/api_test.go integration/container_test.go integration/runtime_test.go runtime.go	2013-11-19 14:58:12 -08:00
Josh Poimboeuf	4b80ec9aae	test: remove extra args in TestExitCode ... The extra blank argument isn't needed and confuses libvirt.	2013-11-18 15:07:11 -06:00
Josh Poimboeuf	72d02ecdde	test: skip TestCreate on Fedora due to lxc utils bug ... In the dind environment running on a Fedora host, the lxc utils get confused by the /sys/fs/cgroup/cpuacct,cpu cgroup mount and lxc-start fails trying to access the wrong cgroup directory.	2013-11-18 10:23:30 -06:00
Victor Vieux	661a8a0e0c	fix Integration tests	2013-11-14 14:46:13 -08:00
Victor Vieux	c001a5af67	Integration tests: remove dependency on private APIs	2013-11-14 10:50:43 -08:00
Solomon Hykes	359a6f49b9	Move integration tests to integration/, expose missing public methods in the core	2013-11-14 10:50:00 -08:00

Renamed from container_test.go (Browse further)