Fixes to docs and merge tags
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/0aec8515 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/0aec8515 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/0aec8515 Branch: refs/heads/trunk Commit: 0aec8515047fd4776d0c5be8fe37b8d96aaf16e7 Parents: f909e6b Author: anthony-shaw <[email protected]> Authored: Wed Jan 6 21:45:53 2016 +1100 Committer: anthony-shaw <[email protected]> Committed: Wed Jan 6 21:45:53 2016 +1100 ---------------------------------------------------------------------- contrib/generate_provider_feature_matrix_table.py | 4 +--- docs/examples/container/docker/deploy_container.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/0aec8515/contrib/generate_provider_feature_matrix_table.py ---------------------------------------------------------------------- diff --git a/contrib/generate_provider_feature_matrix_table.py b/contrib/generate_provider_feature_matrix_table.py index 43e6bfb..5bdcf32 100755 --- a/contrib/generate_provider_feature_matrix_table.py +++ b/contrib/generate_provider_feature_matrix_table.py @@ -45,17 +45,15 @@ from libcloud.dns.providers import get_driver as get_dns_driver from libcloud.dns.providers import DRIVERS as DNS_DRIVERS from libcloud.dns.types import Provider as DNSProvider -<<<<<<< HEAD from libcloud.container.base import ContainerDriver from libcloud.container.providers import get_driver as get_container_driver from libcloud.container.providers import DRIVERS as CONTAINER_DRIVERS from libcloud.container.types import Provider as ContainerProvider -======= + from libcloud.backup.base import BackupDriver from libcloud.backup.providers import get_driver as get_backup_driver from libcloud.backup.providers import DRIVERS as BACKUP_DRIVERS from libcloud.backup.types import Provider as BackupProvider ->>>>>>> trunk REQUIRED_DEPENDENCIES = [ 'pysphere' http://git-wip-us.apache.org/repos/asf/libcloud/blob/0aec8515/docs/examples/container/docker/deploy_container.py ---------------------------------------------------------------------- diff --git a/docs/examples/container/docker/deploy_container.py b/docs/examples/container/docker/deploy_container.py index 7d643c2..7c59dc2 100644 --- a/docs/examples/container/docker/deploy_container.py +++ b/docs/examples/container/docker/deploy_container.py @@ -4,7 +4,7 @@ from libcloud.container.providers import get_driver cls = get_driver(Provider.DOCKER) driver = cls(host='https://198.61.239.128', port=4243, - key_file='key.pem', cert_file='cert.pem') + key_file='key.pem', cert_file='cert.pem') image = driver.install_image('tomcat:8.0') container = driver.deploy_container('tomcat', image)
