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
..
api_test.go	gofmt_test	2013-11-18 11:25:13 -08:00
auth_test.go	gofmt_test	2013-11-18 11:25:13 -08:00
buildfile_test.go	Integration tests: remove dependency on private APIs	2013-11-14 10:50:43 -08:00
commands_test.go	Merge branch 'master' into 0.6.5-dm-plugin	2013-11-21 17:18:41 -08:00
container_test.go	Merge branch 'master' into 0.6.5-dm-plugin	2013-11-21 17:18:41 -08:00
graph_test.go	Fix unit-tests	2013-11-19 15:24:14 -08:00
iptables_test.go	Move iptables test to integration tests	2013-11-15 01:15:39 +00:00
runtime_test.go	Refactor State to be 100% thread safe	2013-11-21 16:34:58 -08:00
server_test.go	test: fix TestRmi race condition	2013-11-18 15:07:06 -06:00
sorter_test.go	Integration tests: remove dependency on private APIs	2013-11-14 10:50:43 -08:00
utils_test.go	Refactor State to be 100% thread safe	2013-11-21 16:34:58 -08:00
z_final_test.go	Move integration tests to integration/, expose missing public methods in the core	2013-11-14 10:50:00 -08:00