Return-Path: X-Original-To: apmail-libcloud-notifications-archive@www.apache.org Delivered-To: apmail-libcloud-notifications-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7FD5B18C5D for ; Wed, 20 Jan 2016 03:43:51 +0000 (UTC) Received: (qmail 90735 invoked by uid 500); 20 Jan 2016 03:43:51 -0000 Delivered-To: apmail-libcloud-notifications-archive@libcloud.apache.org Received: (qmail 90685 invoked by uid 500); 20 Jan 2016 03:43:51 -0000 Mailing-List: contact notifications-help@libcloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@libcloud.apache.org Delivered-To: mailing list notifications@libcloud.apache.org Received: (qmail 89499 invoked by uid 500); 20 Jan 2016 03:43:50 -0000 Delivered-To: apmail-libcloud-commits@libcloud.apache.org Received: (qmail 89475 invoked by uid 99); 20 Jan 2016 03:43:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jan 2016 03:43:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DF57BE38BE; Wed, 20 Jan 2016 03:43:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anthonyshaw@apache.org To: commits@libcloud.apache.org Date: Wed, 20 Jan 2016 03:44:19 -0000 Message-Id: <497512c9424b46fa8bdb9342e04aef13@git.apache.org> In-Reply-To: <1166e22aeba746c0bb4aa4b53509ba8a@git.apache.org> References: <1166e22aeba746c0bb4aa4b53509ba8a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/50] libcloud git commit: Fixes to docs and merge tags 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 Authored: Wed Jan 6 21:45:53 2016 +1100 Committer: anthony-shaw 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)