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/7123206a
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7123206a
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7123206a

Branch: refs/heads/trunk
Commit: 7123206a9ee32333da7fc92905acb0bb16d37d0a
Parents: 925613a ab7d07b
Author: Tomaz Muraus <[email protected]>
Authored: Mon Jan 26 20:17:55 2015 +0100
Committer: Tomaz Muraus <[email protected]>
Committed: Mon Jan 26 20:17:55 2015 +0100

----------------------------------------------------------------------
 CHANGES.rst                                     |  5 +++
 docs/compute/drivers/gce.rst                    | 36 ++++++++++-------
 docs/examples/compute/gce/gce_internal_auth.py  |  7 +++-
 .../examples/compute/gce/gce_service_account.py |  2 +
 libcloud/common/google.py                       | 41 +++++++++++++-------
 libcloud/test/common/fixtures/google/pkey.json  |  7 ++++
 libcloud/test/common/fixtures/google/pkey.pem   | 15 +++++++
 libcloud/test/common/test_google.py             | 32 +++++++++++++--
 libcloud/test/compute/test_gce.py               |  2 +-
 9 files changed, 114 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/7123206a/CHANGES.rst
----------------------------------------------------------------------

Reply via email to