I had to rebase 15602. But all 3 are merged now. Commit 55c92db (+1 for release-notes) will be 3.7.16. I'm at the airport right now travelling to Berlin for the Summit. I'll be running tests as I travel. I hope to have 3.7.16 tagged when I reach Berlin early tomorrow morning. ~kaushal On Sun, Oct 2, 2016 at 10:47 PM, Niels de Vos <ndevos@xxxxxxxxxx> wrote: > On Sun, Oct 02, 2016 at 04:39:35PM +0530, Kaushal M wrote: > ... >> Neils, one of the changes you listed has a merge-conflict. I'll merge >> the other two, only if you can confirm they are all independent of >> each other. >> If you could confirm before this time tomorrow, I'll take them in. > > Thanks! The merge conflict should resolve itself when you merge the > changes in this order: > > 1. http://review.gluster.org/15600 > 2. http://review.gluster.org/15601 > 3. http://review.gluster.org/15602 > > Niels > > >> >> Thanks, >> Kaushal >> >> On Fri, Sep 30, 2016 at 9:00 PM, Niels de Vos <ndevos@xxxxxxxxxx> wrote: >> > On Mon, Sep 26, 2016 at 03:08:42PM +0530, Kaushal M wrote: >> >> Hi all, >> >> >> >> GlusterFS-3.7.16 is on target to be released on Sep 30, 4 days from now. >> >> >> >> In preparation for the release, maintainers please stop merging >> >> anymore changes into release-3.7. >> >> If any developer has a change that needs to be merged, please reply to >> >> this email before end of day Sep 28. >> >> >> >> At this moment, 16 changes have been merged on top of v3.7.15. There >> >> are still 5 patches under review that have been added since the last >> >> release [2]. >> > >> > I've backported and posted some additional patches that were waiting on >> > mainline reviews. That has finally happened and the 3.7 versions are >> > available in Gerrit now: >> > http://review.gluster.org/#/q/project:glusterfs+branch:release-3.7+topic:bug-1347715+NOT+status:abandoned >> > >> > Regression tests are slowly passing (and smoke rechecked). It would be >> > most welcome if these changes can be included in the 3.7.16 release. >> > >> > Thanks, >> > Niels >> > >> > >> >> >> >> Thanks, >> >> Kaushal >> >> >> >> [1] http://review.gluster.org/#/q/project:glusterfs+branch:release-3.7+status:open >> >> _______________________________________________ >> >> maintainers mailing list >> >> maintainers@xxxxxxxxxxx >> >> http://www.gluster.org/mailman/listinfo/maintainers _______________________________________________ Gluster-devel mailing list Gluster-devel@xxxxxxxxxxx http://www.gluster.org/mailman/listinfo/gluster-devel