Yair Zaslavsky has submitted this change and it was merged. Change subject: core: fix db upgrade conflict ...................................................................... core: fix db upgrade conflict Change-Id: I1b4abe97a5403a5c75b9b385f1d046f7a14d0131 Signed-off-by: Yair Zaslavsky <yzaslavs(a)redhat.com&gt; --- R packaging/dbscripts/upgrade/03_03_0960_add_dwh_heartbeat.sql 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ravi Nori: Looks good to me, but someone else must approve Gilad Chaplik: Looks good to me, approved Yair Zaslavsky: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/19849 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1b4abe97a5403a5c75b9b385f1d046f7a14d0131 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <yzaslavs(a)redhat.com&gt; Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com&gt; Gerrit-Reviewer: Ravi Nori <rnori(a)redhat.com&gt; Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com&gt;