You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2016/06/25 23:37:49 UTC
[13/14] libcloud git commit: Merge branch 'docker_updates' into trunk
Closes #821
Merge branch 'docker_updates' into trunk
Closes #821
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/eaa6b9a6
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/eaa6b9a6
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/eaa6b9a6
Branch: refs/heads/trunk
Commit: eaa6b9a6254530efabd5c6946cb3766a48ee05a8
Parents: 1eed728 a99601a
Author: Anthony Shaw <an...@apache.org>
Authored: Sun Jun 26 09:35:51 2016 +1000
Committer: Anthony Shaw <an...@apache.org>
Committed: Sun Jun 26 09:35:51 2016 +1000
----------------------------------------------------------------------
libcloud/container/drivers/docker.py | 72 +++---
.../fixtures/docker/container_a68.json | 163 ------------
.../container/fixtures/docker/containers.json | 143 -----------
.../fixtures/docker/create_container.json | 4 -
.../container/fixtures/docker/create_image.json | 1 -
.../test/container/fixtures/docker/images.json | 50 ----
.../docker/linux_121/container_a68.json | 163 ++++++++++++
.../fixtures/docker/linux_121/containers.json | 143 +++++++++++
.../docker/linux_121/create_container.json | 4 +
.../fixtures/docker/linux_121/create_image.json | 1 +
.../fixtures/docker/linux_121/images.json | 50 ++++
.../fixtures/docker/linux_121/logs.txt | 1 +
.../fixtures/docker/linux_121/search.json | 202 +++++++++++++++
.../fixtures/docker/linux_121/version.json | 10 +
.../test/container/fixtures/docker/logs.txt | 1 -
.../fixtures/docker/mac_124/containers.json | 242 ++++++++++++++++++
.../docker/mac_124/create_container.json | 4 +
.../fixtures/docker/mac_124/create_image.json | 1 +
.../fixtures/docker/mac_124/search.json | 152 +++++++++++
.../fixtures/docker/mac_124/version.json | 11 +
.../test/container/fixtures/docker/search.json | 202 ---------------
.../test/container/fixtures/docker/version.json | 10 -
libcloud/test/container/test_docker.py | 251 ++++++++++---------
23 files changed, 1162 insertions(+), 719 deletions(-)
----------------------------------------------------------------------