Allon Mureinik has submitted this change and it was merged. Change subject: vdsbroker: introduce MergeVDSCommand ...................................................................... vdsbroker: introduce MergeVDSCommand This command calls a new VDSM verb, merge, which will merge VM snapshots while a VM is running. Change-Id: I320d1ac7de50f4a24236c6d26af75a3483b8bc5e Bug-Url: https://bugzilla.redhat.com/1058160 Signed-off-by: Greg Padgett <gpadgett@redhat.com> --- A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MergeVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java 7 files changed, 183 insertions(+), 0 deletions(-) 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/26907 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I320d1ac7de50f4a24236c6d26af75a3483b8bc5e Gerrit-PatchSet: 15 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadgett@redhat.com> Gerrit-Reviewer: Adam Litke <alitke@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Federico Simoncelli <fsimonce@redhat.com> Gerrit-Reviewer: Greg Padgett <gpadgett@redhat.com> Gerrit-Reviewer: Liron Ar <laravot@redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali@redhat.com> Gerrit-Reviewer: Ravi Nori <rnori@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs@redhat.com> Gerrit-Reviewer: automation@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server