Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/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/a58a6e5f Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a58a6e5f Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a58a6e5f Branch: refs/heads/trunk Commit: a58a6e5faa1b30e9057b72a02b3ea19f5e680d74 Parents: 822305c 095db8b Author: Anthony Shaw <[email protected]> Authored: Thu Nov 10 09:51:51 2016 +1100 Committer: Anthony Shaw <[email protected]> Committed: Thu Nov 10 09:51:51 2016 +1100 ---------------------------------------------------------------------- CHANGES.rst | 4 ++++ libcloud/compute/drivers/gce.py | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/a58a6e5f/CHANGES.rst ---------------------------------------------------------------------- diff --cc CHANGES.rst index e575563,0f1a24e..014f656 --- a/CHANGES.rst +++ b/CHANGES.rst @@@ -8,10 -8,10 +8,14 @@@ Changes in current version of Apache Li Compute ~~~~~~~ +- [google] Prevent GCE auth to hide S3 auth + (GITHUB-921) + [Quentin Pradet] + + - [google compute] List images fix for projects > 500 images. + (GITHUB-939) + [Scott Crunkleton] + - [ec2] Add st1 and sc1 volume types to valid types (GITHUB-925) [Sean Goller]
