<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Oct 30, 2013 at 9:06 AM, Andreas Jaeger <span dir="ltr"><<a href="mailto:aj@suse.com" target="_blank">aj@suse.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Anne, this is great news.<br>
<br>
Are there any caveats we have to use when adding changes to the Guide -<br>
or when reviewing? In which ways does this work set us boundaries?<br></blockquote><div><br></div><div>I'm pretty sure there will be rules to work within, but we haven't figured them out quite yet. </div><div><br>
</div><div>Here's Jim Blair's initial thinking. Atlas is the front-end for O'Reilly's editing and publishing engine that is backed by github. </div><div>---</div><div><span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">I had some further thoughts on how we could more closely integrate Atlas</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">with the OpenStack dev workflow, minimizing disruption from merge</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">conflicts without the need for a freeze. Here are the steps:</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px"><span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">1) OpenStack makes a branch of the repo in Gerrit to minimize disruption</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">caused by changes to master while leaving master open for new</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">submissions.</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px"><span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">2) O'reilly Creates an account in launchpad and gerrit for Atlas. That</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">account will need to agree to the OpenStack Individual CLA, or the infra</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">team will need to special-case it. I'm not sure who the copyright</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">holder is for the work that O'Reilly will be doing, so adjust this step</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">as appropriate.</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px"><span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">3) Configure Atlas to pull from the branch created in (1) and push</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">to the appropriate gerrit ref (HEAD:refs/for/branchname).</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px"><span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">As long as the commits that Atlas creates have the Author: set to the</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">actual author of the text, and the Committer: set to the email address</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">registered with Gerrit, it will accept the commit and the attribution in</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">the git history will be correct.</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px"><span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">4) Approve changes submitted by Atlas, and when complete, merge the</span><br style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:'Segoe UI',Helvetica,Arial,sans-serif;font-size:13px">branch into master.</span><br></div><div><br></div><div>---</div><div><br></div><div>So far all we have done is O'Reilly made a branch from the latest merged from 10/23. We have 2 edits in master in review after that point, so we'll figure out that merge mentally/manually I believe. Sorry for the non-answer but hopefully that gives you more info to think upon as I'm certain your eyes will be useful here! I think after the Summit we'll review the process in earnest.</div>
<div>Thanks,</div><div>Anne</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<span class=""><font color="#888888"><br>
Andreas<br>
--<br>
Andreas Jaeger aj@{<a href="http://suse.com" target="_blank">suse.com</a>,<a href="http://opensuse.org" target="_blank">opensuse.org</a>} Twitter/Identica: jaegerandi<br>
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany<br>
GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)<br>
GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126<br>
</font></span></blockquote></div><br></div></div>