You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2014/01/17 20:01:49 UTC
[4/6] git commit: Merge branch 'trunk' of
https://git-wip-us.apache.org/repos/asf/libcloud into GCE_Docs_Update
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/libcloud into GCE_Docs_Update
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/2d3067b1
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/2d3067b1
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/2d3067b1
Branch: refs/heads/trunk
Commit: 2d3067b184608b121ea268c82076f8874863b5a7
Parents: 655b9ac b4a708f
Author: Rick Wright <ri...@google.com>
Authored: Fri Jan 17 10:06:41 2014 -0800
Committer: Rick Wright <ri...@google.com>
Committed: Fri Jan 17 10:06:41 2014 -0800
----------------------------------------------------------------------
CHANGES.rst | 14 ++++
docs/compute/drivers/ec2.rst | 20 ++++++
.../compute/ec2/temporary_credentials.py | 6 ++
docs/examples/storage/s3/upload_object_acls.py | 19 ++++++
docs/storage/drivers/s3.rst | 24 +++++++
docs/upgrade_notes.rst | 15 +++++
libcloud/common/aws.py | 41 ++++++++++-
libcloud/compute/drivers/ec2.py | 4 +-
libcloud/compute/drivers/gce.py | 47 ++++++++++---
libcloud/storage/drivers/google_storage.py | 4 +-
libcloud/storage/drivers/s3.py | 47 ++++++++-----
libcloud/test/storage/test_google_storage.py | 4 ++
libcloud/test/storage/test_s3.py | 71 ++++++++++++++++++--
13 files changed, 281 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/2d3067b1/libcloud/compute/drivers/gce.py
----------------------------------------------------------------------
diff --cc libcloud/compute/drivers/gce.py
index 435b53e,6444455..93fd2da
--- a/libcloud/compute/drivers/gce.py
+++ b/libcloud/compute/drivers/gce.py
@@@ -1209,8 -1213,15 +1217,15 @@@ class GCENodeDriver(NodeDriver)
:type use_existing_disk: ``bool``
:keyword poll_interval: Number of seconds between status checks.
- :type poll_interval: ``int``
+ :type poll_interval: ``int``
+ :keyword external_ip: The external IP address to use. If 'ephemeral'
+ (default), a new non-static address will be
+ used. If 'None', then no external address will
+ be used. (Static addresses are not supported for
+ multiple node creation.)
+ :type external_ip: ``str`` or None
+
:keyword timeout: The number of seconds to wait for all nodes to be
created before timing out.
:type timeout: ``int``