Merge remote-tracking branch 'me/combine_docker_fix' into trunk Closes #895
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/82df6e96 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/82df6e96 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/82df6e96 Branch: refs/heads/trunk Commit: 82df6e961b6f3e581cb404a01acfee4ce498d1c6 Parents: 31897dd 3fafba8 Author: Anthony Shaw <anthonys...@apache.org> Authored: Sun Oct 9 20:32:04 2016 +1100 Committer: Anthony Shaw <anthonys...@apache.org> Committed: Sun Oct 9 20:32:04 2016 +1100 ---------------------------------------------------------------------- libcloud/common/base.py | 2 ++ libcloud/container/drivers/docker.py | 38 +++++++++++------------ libcloud/test/container/test_docker.py | 48 ++++++++++++++--------------- 3 files changed, 45 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
