Change in ovirt-engine[master]: core, db: add config values for Live Merge feature

[amureini at redhat.com]

Allon Mureinik has submitted this change and it was merged.

Change subject: core, db: add config values for Live Merge feature
......................................................................


core, db: add config values for Live Merge feature

Add configuration values for Live Merge, specifying the compatibility
versions for this feature.

Change-Id: I663690c7a11505aa5be2fbab14f49532e4bd3e12
Bug-Url: https://bugzilla.redhat.com/1058160
Signed-off-by: Greg Padgett <gpadgett at redhat.com>
---
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
4 files changed, 21 insertions(+), 1 deletion(-)

Approvals:
  Ravi Nori: Looks good to me, but someone else must approve
  Greg Padgett: Verified
  Federico Simoncelli: Looks good to me, but someone else must approve
  Allon Mureinik: Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/27751
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I663690c7a11505aa5be2fbab14f49532e4bd3e12
Gerrit-PatchSet: 12
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Padgett <gpadgett at redhat.com>
Gerrit-Reviewer: Adam Litke <alitke at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Daniel Erez <derez at redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce at redhat.com>
Gerrit-Reviewer: Greg Padgett <gpadgett at redhat.com>
Gerrit-Reviewer: Liron Ar <laravot at redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali at redhat.com>
Gerrit-Reviewer: Ravi Nori <rnori at redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server