3 Commits

Include renames

Author	SHA1	Message	Date
Paul Bellamy	0de292c0d4	[proxy] attach containers with --net=none to weave	2015-08-14 13:48:32 +01:00
Matthias Radestock	fa2aa1f791	Merge branch '1.0' ... Conflicts: test/640_proxy_restart_reattaches_test.sh	2015-08-13 19:46:23 +01:00
Tom Wilkie	669a0db528	Run integration tests in parallel when possible.	2015-07-29 17:28:58 +00:00