[Gluster-Maintainers] Branch rebase (Re: Jenkins build is back to normal : experimental-periodic #130)

[Kotresh Hiremath Ravishankar]

Not again, I was about to ask you to rebase last week and I thought that
happens only once in
3 months. Hopefully this time, there is no manual conflict resolution:)

-Kotresh HR

On Mon, Dec 11, 2017 at 5:57 AM, Amar Tumballi <atumball at redhat.com> wrote:

> 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.
>
> Below is the only diff between master and experimental (you would need a
> refresh if you already have experimental branch checked out).
>
> [atumball at dhcp35-224 glusterfs]$ git log origin/master... --oneline
>> 2d40451 rio: Added (s)setattr and (f)truncate support
>> e7ce276 rio/posix2: Cleanup unused files
>> 5d52d0d rio: Add iatt cleanup for iatt returned from DS
>> 864ca2b rio: Add ability to handle dirty inodes in MDS FOPs
>> 6f07949 rio: Reorganize RIO server code for DS operations
>> b0ee0bc rio/posix2: Add DS FOP support
>> 9a6eab1 posix2: Reorganize posix2 in preparation for DS FOPs
>> fe2bb3b rio: Add layout search functionality for DS
>> e41b71b rio: Add ability to handle remote inodes in lookup
>> 3288466 rio: Add mkdir FOP
>> d39c38b rio: Added client FOP generation code and create code
>> 7e22831 posix2: fix ./tests/basic/0symbol-check.t
>> d396432 rio/posix2: Some generic fixes as the code is excercised
>> b31d7b2 rio/posix2: Include posix inode/fd ops, implement entry ops
>> 7fc9210 experimental/rio: Script to generate rio volfiles
>> c3cb52f experimental/rio: RIO initialization and layout abstraction
>> 1a77a28 dentry fop serializer: added new server side xlator for dentry
>> fop serialization
>> 72a802d snapshot/snapview-client : redefine options for GD2
>> f6b1827 Add new fields to translator options(quota and marker) for GD2
>> e768810 stripe, quiesce: volume option fixes
>> f5ee636 rfc.sh: fixes for faster submit
>
>
> Regards,
> Amar
>
> On Fri, Nov 17, 2017 at 1:35 AM, Amar Tumballi <atumball at redhat.com>
> wrote:
>
>> 'experimental' is now rebased to latest master branch + non-conflicting
>> patches on option changes.
>>
>> Mainly missing (which was done previously in experimental are)
>>
>> * RIO patches (both RIO side, and posix re-org side)
>> * fuse --lru-limit options
>> * metrics dump options
>> * SDFS xlator (latest version sent to master for review).
>>
>> Please consider re-sending them after resolving conflicts if you want to
>> continue developing, or else, you can post it to master itself.
>>
>> to find the experimental branch in previous version, please check
>> https://github.com/amarts/glusterfs/tree/experimental-v2
>>
>> Regards,
>> Amar
>>
>> On Sat, Nov 4, 2017 at 11:40 AM, Amar Tumballi <atumball at redhat.com>
>> wrote:
>>
>>> 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.
>>>
>>> Regards,
>>> Amar
>>>
>>> On 04-Nov-2017 10:28 AM, <jenkins at build.gluster.org> wrote:
>>>
>>> See <https://build.gluster.org/job/experimental-periodic/130/dis
>>> play/redirect?page=changes>
>>>
>>>
>>>
>>
>>
>> --
>> Amar Tumballi (amarts)
>>
>
>
>
> --
> Amar Tumballi (amarts)
>



-- 
Thanks and Regards,
Kotresh H R
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.gluster.org/pipermail/maintainers/attachments/20171211/998abae0/attachment-0001.html>