[ https://ovirt-jira.atlassian.net/browse/OVIRT-1345?page=com.atlassian.jira.p... ] Gil Shinar updated OVIRT-1345: ------------------------------ Resolution: Fixed Status: Done (was: To Do) There were no empty/duplicate commits but merged commits. The repo was configured to "merge if necessary" and I have changed it to "rebase if necessary"

Problem in with ovirt-engine-metrics repo -----------------------------------------

Key: OVIRT-1345 URL: https://ovirt-jira.atlassian.net/browse/OVIRT-1345 Project: oVirt - virtualization made easy Issue Type: By-EMAIL Reporter: Shirly Radco Assignee: infra

Hi, Earlier today I merged 3 patches to ovirt-engine-metrics. When I check the git log I see 4 parches. Each patch has 2 merges. One is the correct one and the other is empty. I don't see this in Gerrit. I tried to clone the repo again but result is the same. See git log : commit 54a16aa73545c3a39401c969cc27c1887a6b1038 Merge: 6e97bcd adb51fb Author: Shirly Radco <sradco@redhat.com> Date: Mon Apr 24 06:20:06 2017 -0400 Merge "collectd: updated engine processes plugin" commit 6e97bcd7969ab3dbbb60796f5035343ee14f40d7 Merge: 0b63697 3466a8b Author: Shirly Radco <sradco@redhat.com> Date: Mon Apr 24 06:19:57 2017 -0400 Merge "collectd: Fixed processes plugin configurations" commit 0b636971dc7b415b0831edc4abac2493347a5cfe Author: Shirly Radco <sradco@redhat.com> Date: Sun Apr 9 11:43:14 2017 +0300 fluentd: added prefix to the statsd value field Since statds records can be host or vm metrics, I added vm/host prefix to the metric value field name, so the user can choose the required :...skipping... commit 54a16aa73545c3a39401c969cc27c1887a6b1038 Merge: 6e97bcd adb51fb Author: Shirly Radco <sradco@redhat.com> Date: Mon Apr 24 06:20:06 2017 -0400 Merge "collectd: updated engine processes plugin" commit 6e97bcd7969ab3dbbb60796f5035343ee14f40d7 Merge: 0b63697 3466a8b Author: Shirly Radco <sradco@redhat.com> Date: Mon Apr 24 06:19:57 2017 -0400 Merge "collectd: Fixed processes plugin configurations" commit 0b636971dc7b415b0831edc4abac2493347a5cfe Author: Shirly Radco <sradco@redhat.com> Date: Sun Apr 9 11:43:14 2017 +0300 fluentd: added prefix to the statsd value field Since statds records can be host or vm metrics, I added vm/host prefix to the metric value field name, so the user can choose the required metric easily. Change-Id: Ib71dbba78f3922fe1d257c83480867f485a91c22 Signed-off-by: Shirly Radco <sradco@redhat.com> Please see why. I want to build for 4.1.2 and need to be sure repo is ok. Thank you, -- SHIRLY RADCO BI SOFTWARE ENGINEER, Red Hat Israel <https://www.redhat.com/> sradco@redhat.com <https://red.ht/sig> <https://redhat.com/summit>

-- This message was sent by Atlassian JIRA (v1000.910.0#100040)