<div dir="ltr"><div><div>Not again, I was about to ask you to rebase last week and I thought that happens only once in<br></div>3 months. Hopefully this time, there is no manual conflict resolution:)<br><br></div>-Kotresh HR<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Dec 11, 2017 at 5:57 AM, Amar Tumballi <span dir="ltr"><<a href="mailto:atumball@redhat.com" target="_blank">atumball@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">I analysed all the changes in experimental, and it made sense to rebase it to 'master' again, mainly because of the fixes related to testing etc there.<div><br></div><div>Below is the only diff between master and experimental (you would need a refresh if you already have experimental branch checked out).</div><div><br></div><div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><font face="monospace, monospace">[atumball@dhcp35-224 glusterfs]$ git log origin/master... --oneline<br>2d40451 rio: Added (s)setattr and (f)truncate support<br>e7ce276 rio/posix2: Cleanup unused files<br>5d52d0d rio: Add iatt cleanup for iatt returned from DS<br>864ca2b rio: Add ability to handle dirty inodes in MDS FOPs<br>6f07949 rio: Reorganize RIO server code for DS operations<br>b0ee0bc rio/posix2: Add DS FOP support<br>9a6eab1 posix2: Reorganize posix2 in preparation for DS FOPs<br>fe2bb3b rio: Add layout search functionality for DS<br>e41b71b rio: Add ability to handle remote inodes in lookup<br>3288466 rio: Add mkdir FOP<br>d39c38b rio: Added client FOP generation code and create code<br>7e22831 posix2: fix ./tests/basic/0symbol-check.t<br>d396432 rio/posix2: Some generic fixes as the code is excercised<br>b31d7b2 rio/posix2: Include posix inode/fd ops, implement entry ops<br>7fc9210 experimental/rio: Script to generate rio volfiles<br>c3cb52f experimental/rio: RIO initialization and layout abstraction<br>1a77a28 dentry fop serializer: added new server side xlator for dentry fop serialization<br>72a802d snapshot/snapview-client : redefine options for GD2<br>f6b1827 Add new fields to translator options(quota and marker) for GD2<br>e768810 stripe, quiesce: volume option fixes<br>f5ee636 rfc.sh: fixes for faster submit</font></blockquote></div><div><br></div><div>Regards,</div><div>Amar</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Nov 17, 2017 at 1:35 AM, Amar Tumballi <span dir="ltr"><<a href="mailto:atumball@redhat.com" target="_blank">atumball@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">'experimental' is now rebased to latest master branch + non-conflicting patches on option changes.<div><br></div><div>Mainly missing (which was done previously in experimental are)</div><div><br></div><div>* RIO patches (both RIO side, and posix re-org side)</div><div>* fuse --lru-limit options</div><div>* metrics dump options</div><div>* SDFS xlator (latest version sent to master for review).</div><div><br></div><div>Please consider re-sending them after resolving conflicts if you want to continue developing, or else, you can post it to master itself.</div><div><br></div><div>to find the experimental branch in previous version, please check <a href="https://github.com/amarts/glusterfs/tree/experimental-v2" target="_blank">https://github.com/amart<wbr>s/glusterfs/tree/experimental-<wbr>v2</a> </div><div><br></div><div>Regards,</div><div>Amar</div></div><div class="gmail_extra"><div><div class="m_-1716254918385405696h5"><br><div class="gmail_quote">On Sat, Nov 4, 2017 at 11:40 AM, Amar Tumballi <span dir="ltr"><<a href="mailto:atumball@redhat.com" target="_blank">atumball@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="auto">As we did a branch cut out for release-3.13, I plan to do a rebase of experimental branch on top of latest master by Nov 15th. <div dir="auto"><br></div><div dir="auto">Regards,</div><div dir="auto">Amar</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 04-Nov-2017 10:28 AM, <<a href="mailto:jenkins@build.gluster.org" target="_blank">jenkins@build.gluster.org</a>> wrote:<br type="attribution"><blockquote class="m_-1716254918385405696m_-5245649151423081m_-6570908079630365072quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">See <<a href="https://build.gluster.org/job/experimental-periodic/130/display/redirect?page=changes" rel="noreferrer" target="_blank">https://build.gluster.org/job<wbr>/experimental-periodic/130/dis<wbr>play/redirect?page=changes</a>><br>
<br>
</blockquote></div><br></div>
</blockquote></div><br><br clear="all"><span class="HOEnZb"><font color="#888888"><div><br></div></font></span></div></div><span class="HOEnZb"><font color="#888888"><span class="m_-1716254918385405696HOEnZb"><font color="#888888">-- <br><div class="m_-1716254918385405696m_-5245649151423081gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div>Amar Tumballi (amarts)<br></div></div></div></div></div>
</font></span></font></span></div><span class="HOEnZb"><font color="#888888">
</font></span></blockquote></div><span class="HOEnZb"><font color="#888888"><br><br clear="all"><div><br></div>-- <br><div class="m_-1716254918385405696gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div>Amar Tumballi (amarts)<br></div></div></div></div></div>
</font></span></div>
</blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div>Thanks and Regards,<br></div>Kotresh H R<br></div></div>
</div>