Martin Peřina has uploaded a new change for review. Change subject: core: Remove remains of version 2.2 from FencingPolicyHelper ......................................................................
core: Remove remains of version 2.2 from FencingPolicyHelper Removes unnecessary condtions from FencingPolicyHelper class which was needed when 2.2 was containt in Version.ALL list. Change-Id: Iba815fc8a35969917360fea1eccc646e679426b8 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/FencingPolicyHelper.java 1 file changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/32432/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/FencingPolicyHelper.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/FencingPolicyHelper.java index ee5ac4f..1080a73 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/FencingPolicyHelper.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/FencingPolicyHelper.java @@ -18,14 +18,10 @@ throw new IllegalArgumentException(); } - // Version 2.2 is not supported by VDSM, but it's still contained in version list, - // so we cannot just get first element from version list - Version ver = Version.v3_0; + Version ver = Version.ALL.get(0); if (fp.isSkipFencingIfSDActive()) { for (Version v : Version.ALL) { - // Version 2.2 is included in version list, but it's not included in db to set up config values - if (v.compareTo(Version.v3_0) >= 0 && - FeatureSupported.isSkipFencingIfSDActiveSupported(v)) { + if (FeatureSupported.isSkipFencingIfSDActiveSupported(v)) { ver = v; break; } -- To view, visit http://gerrit.ovirt.org/32432 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba815fc8a35969917360fea1eccc646e679426b8 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