Merge branch 'trunk' into LIBCLOUD-781_containers
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/edb1265c Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/edb1265c Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/edb1265c Branch: refs/heads/trunk Commit: edb1265c4a048f730f95920dbea7afbb87b3be0a Parents: c8024ad adfaacf Author: anthony-shaw <[email protected]> Authored: Mon Dec 28 21:11:24 2015 +1100 Committer: anthony-shaw <[email protected]> Committed: Mon Dec 28 21:11:24 2015 +1100 ---------------------------------------------------------------------- .travis.yml | 6 ++++++ libcloud/test/compute/test_ec2.py | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
