 Michael Crosby
|
cdb93a78ac
|
Merge branch 'master' into 0.6.5-dm-plugin
Conflicts:
server.go
Upstream-commit: 2382a0f920f7473b2b2762d886470a417a5dbac7
Component: engine
|
2013-11-20 11:07:42 -08:00 |
|
 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 |
|
 Josh Poimboeuf
|
0c60a3c3a0
|
test: 2 second timeout (not 2000)
Upstream-commit: fe302fbfd26fc7db5d751d4bec8a0bd4ce6030a4
Component: engine
|
2013-11-18 10:23:30 -06:00 |
|
 Victor Vieux
|
1880f01ff8
|
Integration tests: remove dependency on private APIs
Upstream-commit: c001a5af67b7b811a8fc69011fcffc2656b8fd99
Component: engine
|
2013-11-14 10:50:43 -08:00 |
|
 Solomon Hykes
|
6c1679864e
|
Move integration tests to integration/, expose missing public methods in the core
Upstream-commit: 359a6f49b9ec704686d0cb0df7cb0d7c8d5f55a7
Component: engine
|
2013-11-14 10:50:00 -08:00 |
|