|
|
cf914fd88c
|
Merge branch 'master' into 0.6.5-dm-plugin
Conflicts:
container.go
image.go
Upstream-commit: 0cecc2a78c246a5b809954059650a4c22442e0d6
Component: engine
|
2013-11-21 17:18:41 -08:00 |
|
|
|
2e972c6b88
|
Ignore dir sizes in TreeSize func
Upstream-commit: a4f14528c25c4a092c30334d05008fe44275a79e
Component: engine
|
2013-11-13 10:33:24 -08:00 |
|
|
|
7e3e167f73
|
Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface
Upstream-commit: f2bab1557c3fef4a95b5b982fe7127fcb29c4f8f
Component: engine
|
2013-11-07 22:38:50 +00:00 |
|
