Paul Bellamy a0876becbc Merge remote-tracking branch 'upstream/1.0' ...

Conflicts:
	proxy/create_container_interceptor.go
	proxy/create_exec_interceptor.go
	proxy/proxy.go
	proxy/start_container_interceptor.go

2015-07-16 15:29:29 +01:00

..

common.go

Merge branch '1.0'

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

create_container_interceptor.go

Merge remote-tracking branch 'upstream/1.0'

2015-07-16 15:29:29 +01:00

create_exec_interceptor.go

Merge remote-tracking branch 'upstream/1.0'

2015-07-16 15:29:29 +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

Merge remote-tracking branch 'upstream/1.0'

2015-07-16 15:29:29 +01:00

start_container_interceptor.go

Merge remote-tracking branch 'upstream/1.0'

2015-07-16 15:29:29 +01:00

tls.go

[proxy] Add tls support

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