<div dir="ltr">Hi Shirly,<div><br></div><div>Which of the commits below you have pushed?</div><div><img src="cid:ii_15ba3ceec2542be2" alt="Inline image 1" width="871" height="158" style="margin-right: 0px;"><br></div><div><br></div><div>Looks like you've pushed patches without rebasing them on master first.</div><div><br></div><div><b>Update</b>, I have sat with Shirly and we have fixed repo credentials to not allow merging with rebase first.</div><div><br></div><div>Gil </div><div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Apr 24, 2017 at 9:37 PM, Shirly Radco <span dir="ltr"><<a href="mailto:sradco@redhat.com" target="_blank">sradco@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hi,<div><br></div><div><br></div><div>Earlier today I merged 3 patches to ovirt-engine-metrics.</div><div>When I check the git log I see 4 parches. Each patch has 2 merges. </div><div>One is the correct one and the other is empty.</div><div><br></div><div>I don't see this in Gerrit.</div><div>I tried to clone the repo again but result is the same.</div><div><br></div><div><br></div><div>See git log :</div><div><br></div><div><div>commit 54a16aa73545c3a39401c969cc27c1<wbr>887a6b1038</div><div>Merge: 6e97bcd adb51fb</div><div>Author: Shirly Radco <<a href="mailto:sradco@redhat.com" target="_blank">sradco@redhat.com</a>></div><div>Date: Mon Apr 24 06:20:06 2017 -0400</div><div><br></div><div> Merge "collectd: updated engine processes plugin"</div><div><br></div><div>commit 6e97bcd7969ab3dbbb60796f503534<wbr>3ee14f40d7</div><div>Merge: 0b63697 3466a8b</div><div>Author: Shirly Radco <<a href="mailto:sradco@redhat.com" target="_blank">sradco@redhat.com</a>></div><div>Date: Mon Apr 24 06:19:57 2017 -0400</div><div><br></div><div> Merge "collectd: Fixed processes plugin configurations"</div><div><br></div><div>commit 0b636971dc7b415b0831edc4abac24<wbr>93347a5cfe</div><div>Author: Shirly Radco <<a href="mailto:sradco@redhat.com" target="_blank">sradco@redhat.com</a>></div><div>Date: Sun Apr 9 11:43:14 2017 +0300</div><div><br></div><div> fluentd: added prefix to the statsd value field</div><div> </div><div> Since statds records can be host or vm metrics,</div><div> I added vm/host prefix to the metric value</div><div> field name, so the user can choose the required</div><div>:...skipping...</div><div>commit 54a16aa73545c3a39401c969cc27c1<wbr>887a6b1038</div><div>Merge: 6e97bcd adb51fb</div><div>Author: Shirly Radco <<a href="mailto:sradco@redhat.com" target="_blank">sradco@redhat.com</a>></div><div>Date: Mon Apr 24 06:20:06 2017 -0400</div><div><br></div><div> Merge "collectd: updated engine processes plugin"</div><div><br></div><div>commit 6e97bcd7969ab3dbbb60796f503534<wbr>3ee14f40d7</div><div>Merge: 0b63697 3466a8b</div><div>Author: Shirly Radco <<a href="mailto:sradco@redhat.com" target="_blank">sradco@redhat.com</a>></div><div>Date: Mon Apr 24 06:19:57 2017 -0400</div><div><br></div><div> Merge "collectd: Fixed processes plugin configurations"</div><div><br></div><div>commit 0b636971dc7b415b0831edc4abac24<wbr>93347a5cfe</div><div>Author: Shirly Radco <<a href="mailto:sradco@redhat.com" target="_blank">sradco@redhat.com</a>></div><div>Date: Sun Apr 9 11:43:14 2017 +0300</div><div><br></div><div> fluentd: added prefix to the statsd value field</div><div> </div><div> Since statds records can be host or vm metrics,</div><div> I added vm/host prefix to the metric value</div><div> field name, so the user can choose the required</div><div> metric easily.</div><div> </div><div> Change-Id: Ib71dbba78f3922fe1d257c8348086<wbr>7f485a91c22</div><div> Signed-off-by: Shirly Radco <<a href="mailto:sradco@redhat.com" target="_blank">sradco@redhat.com</a>></div><div><br></div><div><br></div></div><div>Please see why.</div><div>I want to build for 4.1.2 and need to be sure repo is ok.</div><div><br></div><div>Thank you,</div><div><br clear="all"><div><div class="m_8714334913951735565gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><pre cols="72" style="white-space:pre-wrap"><span style="font-family:arial,helvetica,sans-serif;font-size:12.8px"><font color="#666666">--</font></span></pre><pre cols="72" style="white-space:pre-wrap"><p style="color:rgb(0,0,0);font-family:overpass,sans-serif;white-space:normal;font-weight:bold;margin:0px;padding:0px;font-size:14px;text-transform:uppercase"><span>SHIRLY</span> <span>RADCO</span></p><p style="color:rgb(0,0,0);font-family:overpass,sans-serif;white-space:normal;font-size:10px;margin:0px 0px 4px;text-transform:uppercase"><span>BI SOFTWARE ENGINEER</span><span style="color:rgb(204,204,204)">,</span></p><p style="font-family:overpass,sans-serif;white-space:normal;margin:0px;font-size:10px;color:rgb(153,153,153)"><a href="https://www.redhat.com/" style="color:rgb(0,136,206);margin:0px;text-decoration:none" target="_blank">Red Hat <span>Israel</span></a></p><p style="font-family:overpass,sans-serif;white-space:normal;margin:0px 0px 6px;font-size:10px;color:rgb(153,153,153)"><span style="margin:0px;padding:0px"><a href="mailto:sradco@redhat.com" style="color:rgb(0,136,206);margin:0px;text-decoration:none" target="_blank">sradco@redhat.com</a> </span></p><table border="0" style="color:rgb(0,0,0);font-family:overpass,sans-serif;font-size:medium;white-space:normal"><tbody><tr><td width="100px"><a href="https://red.ht/sig" target="_blank"><img src="https://www.redhat.com/files/brand/email/sig-redhat.png" width="90" height="auto"></a></td><td style="font-size:10px"><div><a href="https://redhat.com/summit" style="text-decoration:none" target="_blank"><img width="70px" height="auto" src="https://www.redhat.com/files/brand/email/sig-summit.png" style="outline:0px"></a></div></td></tr></tbody></table></pre></div></div></div></div></div></div></div></div></div></div></div></div>
</div></div>
<br>______________________________<wbr>_________________<br>
Infra mailing list<br>
<a href="mailto:Infra@ovirt.org">Infra@ovirt.org</a><br>
<a href="http://lists.ovirt.org/mailman/listinfo/infra" rel="noreferrer" target="_blank">http://lists.ovirt.org/<wbr>mailman/listinfo/infra</a><br>
<br></blockquote></div><br></div>