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

..

archive_test.go

Allow drivers to implement ApplyDiff in Differ interface

2013-11-11 19:09:57 -08:00

archive.go

Merge branch 'master' into creack-merge-master

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

changes_test.go

Mark archive.TestApplyLayer as skipped

2013-11-18 14:31:34 +01:00

changes.go

Implement fallback for getting the size of a container

2013-11-19 10:36:54 +01:00

diff.go

ApplyLayer() use RemoveAll to handle removing directories

2013-11-14 22:56:18 +01:00

MAINTAINERS

Move archive.go to sub package

2013-10-31 16:57:45 -07:00