Paul Bellamy e3e5934c51 Merge remote-tracking branch 'upstream/0.11' ...

Conflicts:
	proxy/common.go

2015-05-28 17:43:30 +01:00

..

client.go

proxy should provide reasonable error when execing on a container which doesn't exist

2015-05-19 17:37:23 +01:00

common.go

Merge remote-tracking branch 'upstream/0.11'

2015-05-28 17:43:30 +01:00

create_container_interceptor.go

Merge remote-tracking branch 'upstream/0.11'

2015-05-28 17:43:30 +01:00

create_exec_interceptor.go

cosmetic: remove some more dead code

2015-05-28 15:23:34 +01:00

interceptor.go

proxy interceptors implicitly modify arguments, instead of returning them

2015-05-19 10:34:46 +01:00

proxy.go

allow proxy to intercept unversioned (i.e. 1.0) urls

2015-05-28 16:24:02 +01:00

start_container_interceptor.go

add 'weave launch-proxy --with-ipam' flag

2015-05-22 15:52:36 +01:00