Martin Peřina has uploaded a new change for review. Change subject: core: Remove version 2.2 from Version and VersionStorageFormatUtil ......................................................................
core: Remove version 2.2 from Version and VersionStorageFormatUtil Remove last usage of version 2.2 from VersionStorageFormatUtil and Version classes. Change-Id: Id43f292215cf35c1e2834c2a2fdac6b08a3bdb2b Bug-Url: https://bugzilla.redhat.com/1127590 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java 2 files changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/32431/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java index c6fa169..860210e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java @@ -54,7 +54,6 @@ private static final Map<Version, StorageFormatTypeMapper> versionToFormat = new TreeMap<Version, StorageFormatTypeMapper>() { { - put(Version.v2_2, new ConstantStorageFormatTypeMapper(StorageFormatType.V1)); put(Version.v3_0, new V2FormatTypeMapper()); put(Version.v3_1, new ConstantStorageFormatTypeMapper(StorageFormatType.V3)); put(Version.v3_2, new ConstantStorageFormatTypeMapper(StorageFormatType.V3)); diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java index 12162f9..6c7de70 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java @@ -15,14 +15,13 @@ private int build; private int revision; - public static final Version v2_2 = new Version(2, 2); public static final Version v3_0 = new Version(3, 0); public static final Version v3_1 = new Version(3, 1); public static final Version v3_2 = new Version(3, 2); public static final Version v3_3 = new Version(3, 3); public static final Version v3_4 = new Version(3, 4); public static final Version v3_5 = new Version(3, 5); - public static final List<Version> ALL = Arrays.asList(v2_2, v3_0, v3_1, v3_2, v3_3, v3_4, v3_5); + public static final List<Version> ALL = Arrays.asList(v3_0, v3_1, v3_2, v3_3, v3_4, v3_5); public Version(String value) { -- To view, visit http://gerrit.ovirt.org/32431 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id43f292215cf35c1e2834c2a2fdac6b08a3bdb2b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
