<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Title" content="">
<meta name="Keywords" content="">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-reply;
font-family:Calibri;
color:windowtext;}
span.msoIns
{mso-style-type:export-only;
mso-style-name:"";
text-decoration:underline;
color:teal;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style>
</head>
<body bgcolor="white" lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:Calibri">Thanks Jeremy ... the remote gerrit setting was my problem ... I had it set to Vitrage because I am also doing some work there.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:Calibri"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:Calibri">I switched it to masakari for this work and was able to submit my spec.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:Calibri"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:Calibri">thanks again,<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:Calibri">Greg.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:Calibri"><o:p> </o:p></span></p>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span style="font-family:Calibri;color:black">From: </span>
</b><span style="font-family:Calibri;color:black">Jeremy Stanley <fungi@yuggoth.org><br>
<b>Reply-To: </b>"openstack-dev@lists.openstack.org" <openstack-dev@lists.openstack.org><br>
<b>Date: </b>Monday, May 29, 2017 at 3:39 PM<br>
<b>To: </b>"openstack-dev@lists.openstack.org" <openstack-dev@lists.openstack.org><br>
<b>Subject: </b>Re: [openstack-dev] [masakari] Intrusive Instance Monitoring<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">On 2017-05-29 14:48:10 +0000 (+0000), Waines, Greg wrote:<o:p></o:p></p>
</div>
<blockquote style="border:none;border-left:solid #B5C4DF 4.5pt;padding:0cm 0cm 0cm 4.0pt;margin-left:3.75pt;margin-right:0cm" id="MAC_OUTLOOK_ATTRIBUTION_BLOCKQUOTE">
<div>
<p class="MsoNormal">Was just trying to submit my spec for Intrusive Instance<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">Monitoring for review.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">And I get the following warning after committing when I do the<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">‘git review’<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">gwaines@gwaines-VirtualBox:~/openstack/masakari-specs$ git review<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">You are about to submit multiple commits. This is expected if you are<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">submitting a commit that is dependent on one or more in-review<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">commits. Otherwise you should consider squashing your changes into one<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">commit before submitting.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">The outstanding commits are:<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">f09deee (HEAD -> myBranch) Initial draft specification of Intrusive Instance Monitoring.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">21aeb96 (origin/master, origin/HEAD, master) Prepare specs repository for Pike<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">83d1a0a Implement reserved_host, auto_priority and rh_priority recovery methods<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">4e746cb Add periodic task to clean up workflow failure<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">2c10be4 Add spec repo structure<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">a82016f Added .gitreview<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">Do you really want to submit the above commits?<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">Type 'yes' to confirm, other to cancel: no<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">Aborting.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">gwaines@gwaines-VirtualBox:~/openstack/masakari-specs$<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">Seems like my clone picked up someone else’s open commit ?<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">Any help would be appreciated,<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">The full log of my git session is below,<o:p></o:p></p>
</div>
</blockquote>
<div>
<p class="MsoNormal">[...]<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">The output doesn't show any open changes, but rather seems to<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">indicate that the parent is the commit at the tip of origin/master.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">This condition shouldn't normally happen unless Gerrit doesn't<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">actually know about any of those commits for some reason.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">One thing, I notice your `git review -s` output in your log was<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">empty. Make sure the output of `git remote show gerrit` looks<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">something like this (obviously with your username in place of mine):<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"> * remote gerrit<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Fetch URL: <a href="ssh://fungi@review.openstack.org:29418/openstack/masakari-specs.git">
ssh://fungi@review.openstack.org:29418/openstack/masakari-specs.git</a><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Push URL: <a href="ssh://fungi@review.openstack.org:29418/openstack/masakari-specs.git">
ssh://fungi@review.openstack.org:29418/openstack/masakari-specs.git</a><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> HEAD branch: master<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Remote branch:<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> master tracked<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Local ref configured for 'git push':<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> master pushes to master (up to date)<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Using git-review 1.25.0 I attempted to replicate the issue like<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">this, but everything worked normally:<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"> fungi@dhole:~/work/openstack/openstack$ git clone <a href="https://github.com/openstack/masakari-specs.git">
https://github.com/openstack/masakari-specs.git</a><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Cloning into 'masakari-specs'...<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> remote: Counting objects: 61, done.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> remote: Total 61 (delta 0), reused 0 (delta 0), pack-reused 61<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Unpacking objects: 100% (61/61), done.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> fungi@dhole:~/work/openstack/openstack$ cd masakari-specs/<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> fungi@dhole:~/work/openstack/openstack/masakari-specs$ git log<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> commit 21aeb965acea0b3ebe8448715bb88df4409dd402<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Author: Abhishek Kekane <<a href="mailto:abhishek.kekane@nttdata.com">abhishek.kekane@nttdata.com</a>><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Date: Wed Apr 19 16:00:53 2017 +0530<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"> Prepare specs repository for Pike<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"> Add directories, index file, and template symlinks for Pike specs.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"> Change-Id: I7dce74430e4569a5978f8f4b953db3b20125c53e<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"> commit 83d1a0aae17e4e8110ac64c7975a8520592712f9<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Author: Abhishek Kekane <<a href="mailto:abhishek.kekane@nttdata.com">abhishek.kekane@nttdata.com</a>><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Date: Fri Jan 20 12:00:12 2017 +0530<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"> Implement reserved_host, auto_priority and rh_priority recovery methods<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"> Implements: bp implement-recovery-methods<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Change-Id: I83ce204d8f25b240fa6ce723dc15192ae9b4e191<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"> commit 4e746cb5a39df5aa833ab32ce7ba961637753a15<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Author: Abhishek Kekane <<a href="mailto:abhishek.kekane@nttdata.com">abhishek.kekane@nttdata.com</a>><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Date: Fri Jan 20 11:38:09 2017 +0530<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"> fungi@dhole:~/work/openstack/openstack/masakari-specs$ git review -s<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Creating a git remote called 'gerrit' that maps to:<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> <a href="ssh://fungi@review.openstack.org:29418/openstack/masakari-specs.git">ssh://fungi@review.openstack.org:29418/openstack/masakari-specs.git</a><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> fungi@dhole:~/work/openstack/openstack/masakari-specs$ git checkout -b myBranch<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> Switched to a new branch 'myBranch'<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> fungi@dhole:~/work/openstack/openstack/masakari-specs$ cp doc/source/specs/pike/implemented/pike-template.rst doc/source/specs/pike/implemented/vmHeartbeat.masa<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> kari.specfile.rst<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> fungi@dhole:~/work/openstack/openstack/masakari-specs$ git add specs/pike/implemented/vmHeartbeat.masakari.specfile.rst<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> fungi@dhole:~/work/openstack/openstack/masakari-specs$ git commit<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> [myBranch 9e5c70e] Test commit<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> 1 file changed, 389 insertions(+)<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> create mode 100644 specs/pike/implemented/vmHeartbeat.masakari.specfile.rst<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> fungi@dhole:~/work/openstack/openstack/masakari-specs$ git review<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> remote: Processing changes: new: 1, refs: 1, done<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> remote:<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> remote: New Changes:<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> remote: <a href="https://review.openstack.org/468941">
https://review.openstack.org/468941</a> Testing, do not review<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> remote:<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> To <a href="ssh://review.openstack.org:29418/openstack/masakari-specs.git">
ssh://review.openstack.org:29418/openstack/masakari-specs.git</a><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> * [new branch] HEAD -> refs/publish/master/myBranch<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">-- <o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">Jeremy Stanley<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
</body>
</html>