Guillaume J. Charmes b6950e3878 Merge branch 'master' into creack-merge-master ...

Conflicts:
	api_params.go
	graph.go
	graph_test.go
	image.go
	integration/api_test.go
	integration/container_test.go
	integration/runtime_test.go
	runtime.go
Upstream-commit: 28d4cbbc59e419f00c1ad75991b106241933ca5d
Component: engine

2013-11-19 14:58:12 -08:00

..

daemon.go

go fmt

2013-11-07 12:27:33 -08:00

fs.go

Ignore dir sizes in TreeSize func

2013-11-13 10:33:24 -08:00

http.go

Lintify code with confidence=1

2013-11-18 16:24:11 -08:00

random.go

go fmt

2013-11-07 12:27:33 -08:00

signal_darwin.go

Add -nostdin and -proxy to docker attach, allow arbirary signal to be sent via docker kill api endpoint

2013-10-18 16:16:29 -07:00

signal_linux.go

Add -nostdin and -proxy to docker attach, allow arbirary signal to be sent via docker kill api endpoint

2013-10-18 16:16:29 -07:00

signal.go

stop proxy at one point

2013-10-29 14:29:01 -07:00

stdcopy.go

Add better comments to utils/stdcopy.go.

2013-10-16 10:58:53 -07:00

tarsum.go

Add import for dotcloud/tar to replace std tar pkg

2013-08-12 22:42:29 +00:00

uname_darwin.go

utils: fix compilation on Darwin

2013-05-19 00:02:42 -03:00

uname_linux.go

fix compilation on linux

2013-05-20 20:43:09 +03:00

utils_test.go

gofmt

2013-11-13 19:25:55 +00:00

utils.go

Lintify code with confidence=1

2013-11-18 16:24:11 -08:00