Matthias Radestock 4d887c8a55 Merge branch '1.0' ...

Conflicts:
	proxy/create_exec_interceptor.go
	test/610_proxy_wait_for_weave_test.sh

2015-07-15 18:07:11 +01:00

..

common.go

Merge branch '1.0'

2015-07-14 18:09:25 +01:00

create_container_interceptor.go

Merge pull request #1126 from weaveworks/issues/1018-more-flexible-hostname-derivation

2015-07-14 17:31:53 +01:00

create_exec_interceptor.go

Merge branch '1.0'

2015-07-15 18:07:11 +01:00

interceptor.go

proxy interceptors implicitly modify arguments, instead of returning them

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

proxy_intercept.go

Replace logging calls with new style

2015-07-01 12:26:23 +01:00

proxy.go

Address PR comments

2015-07-14 15:31:44 +00:00

start_container_interceptor.go

[proxy] print all stderr from callWeave to the proxy logs, even if successful

2015-07-03 15:45:09 +01:00

tls.go

[proxy] Add tls support

2015-06-05 13:23:14 +01:00