Merge remote-tracking branch 'libcloud/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/1d21f444 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/1d21f444 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/1d21f444 Branch: refs/heads/trunk Commit: 1d21f444e41f40ec32c4222cfb8b1542486bb862 Parents: 43fbf56 232f949 Author: Anthony Shaw <anthony.p.s...@gmail.com> Authored: Fri Nov 13 13:54:01 2015 +1100 Committer: Anthony Shaw <anthony.p.s...@gmail.com> Committed: Fri Nov 13 13:54:01 2015 +1100 ---------------------------------------------------------------------- CHANGES.rst | 5 ++ libcloud/common/dimensiondata.py | 54 +++++++++++++++++-- libcloud/compute/drivers/dimensiondata.py | 55 ++++++++++++++------ libcloud/loadbalancer/drivers/dimensiondata.py | 29 +++++++++++ ...2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml | 26 +-------- ...lan_0e56433f_d808_4669_821d_812769517ff8.xml | 2 +- libcloud/test/compute/test_dimensiondata.py | 7 ++- 7 files changed, 134 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
