Merge branch 'trunk' of git://git.apache.org/libcloud into trunk
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/167f24b3 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/167f24b3 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/167f24b3 Branch: refs/heads/trunk Commit: 167f24b3fcf2a0cb304742138b87f9045bf832e6 Parents: 9a7a0c4 2b3beef Author: [email protected] <[email protected]> Authored: Tue Jan 26 08:37:27 2016 +1100 Committer: [email protected] <[email protected]> Committed: Tue Jan 26 08:37:27 2016 +1100 ---------------------------------------------------------------------- .travis.yml | 37 ++++++++++++++++++--------- CHANGES.rst | 12 ++++++++- docs/backup/index.rst | 2 +- docs/container/index.rst | 24 ++++++++--------- docs/upgrade_notes.rst | 4 +-- libcloud/compute/ssh.py | 3 ++- libcloud/container/drivers/kubernetes.py | 3 +-- libcloud/container/utils/docker.py | 14 +++++----- requirements-tests.txt | 4 +-- tox.ini | 3 ++- 10 files changed, 64 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
