Fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/e846f57b Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/e846f57b Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/e846f57b Branch: refs/heads/trunk Commit: e846f57b57f70d93d7ff4d18e12bda32f921e9da Parents: 1252120 cd7fe0e Author: Samuel Chong <[email protected]> Authored: Tue Nov 15 11:49:14 2016 +1100 Committer: Samuel Chong <[email protected]> Committed: Tue Nov 15 11:49:14 2016 +1100 ---------------------------------------------------------------------- libcloud/common/dimensiondata.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/e846f57b/libcloud/common/dimensiondata.py ---------------------------------------------------------------------- diff --cc libcloud/common/dimensiondata.py index b7a0b18,3cb9f66..198fa02 --- a/libcloud/common/dimensiondata.py +++ b/libcloud/common/dimensiondata.py @@@ -380,13 -376,13 +381,13 @@@ class DimensionDataConnection(Connectio api_version_1 = 0.9 # Earliest version supported - oldest_api_version = 2.2 + oldest_api_version = '2.2' # Latest version supported - latest_api_version = 2.4 - latest_api_version = '2.3' ++ latest_api_version = '2.4' # Default api version - active_api_version = 2.4 + active_api_version = '2.3' _orgId = None responseCls = DimensionDataResponse
