Return-Path: X-Original-To: apmail-libcloud-commits-archive@www.apache.org Delivered-To: apmail-libcloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B6AD410BCA for ; Thu, 15 Aug 2013 20:06:04 +0000 (UTC) Received: (qmail 68817 invoked by uid 500); 15 Aug 2013 20:03:43 -0000 Delivered-To: apmail-libcloud-commits-archive@libcloud.apache.org Received: (qmail 68530 invoked by uid 500); 15 Aug 2013 20:03:28 -0000 Mailing-List: contact commits-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 commits@libcloud.apache.org Received: (qmail 67528 invoked by uid 99); 15 Aug 2013 20:02:21 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Aug 2013 20:02:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9DDA1837502; Thu, 15 Aug 2013 20:02:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tomaz@apache.org To: commits@libcloud.apache.org Date: Thu, 15 Aug 2013 20:02:21 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Update EC2 docstring to correctly indicate ex_securitygroup type and description. Updated Branches: refs/heads/trunk d7e08d340 -> a3c0479ca Update EC2 docstring to correctly indicate ex_securitygroup type and description. Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/adfbce14 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/adfbce14 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/adfbce14 Branch: refs/heads/trunk Commit: adfbce1456898fa05a83594218bcfb5a8b34864d Parents: d7e08d3 Author: Tomaz Muraus Authored: Thu Aug 15 21:48:38 2013 +0200 Committer: Tomaz Muraus Committed: Thu Aug 15 21:48:38 2013 +0200 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/adfbce14/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index f2b1109..5d18469 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -1325,8 +1325,9 @@ class BaseEC2NodeDriver(NodeDriver): @keyword ex_maxcount: Maximum number of instances to launch @type ex_maxcount: C{int} - @keyword ex_securitygroup: Name of security group - @type ex_securitygroup: C{str} + @keyword ex_securitygroup: Name of security group or a list of names + for multiple security groups. + @type ex_securitygroup: C{str} or C{list} @keyword ex_keyname: The name of the key pair @type ex_keyname: C{str}