I'm confused, napalm is 2.6-dev, not 2.5.x
On Thu, Aug 17, 2017 at 5:13 PM, Frank Filz <ffilz...@mindspring.com> wrote:
> Actually, the problem was Bill’s Napalm…
>
>
>
> I was able to make sense of the manual merge for
>
>
>
> ff98ea64b6d1228443a35b2f7ceb3c61c0a0c1d1 Build libntirpc package when not
> using system ntirpc
>
>
>
> But not for
>
>
>
> 6bd32da613e26a768ac1dc4db1001395bd10c295 CMake - Have 'make dist'
> generate the correct tarball name
>
>
>
> I pushed my results to
>
>
>
> https://github.com/ffilz/nfs-ganesha/commits/V2.5-stable
>
>
>
> Frank
>
>
>
> *From:* Malahal Naineni [mailto:mala...@gmail.com]
> *Sent:* Thursday, August 17, 2017 10:39 AM
> *To:* Frank Filz <ffilz...@mindspring.com>
> *Cc:* Matt Benjamin <mbenj...@redhat.com>; Soumya Koduri <
> skod...@redhat.com>; nfs-ganesha-devel <nfs-ganesha-devel@lists.
> sourceforge.net>
>
> *Subject:* Re: [Nfs-ganesha-devel] Proposed backports for 2.5.2
>
>
>
> I did but the failover/failback code re-org looked like contributed, but I
> am not positive.
>
>
>
> On Thu, Aug 17, 2017 at 7:40 PM, Frank Filz <ffilz...@mindspring.com>
> wrote:
>
> Hmm, did you cherry pick in the original order?
>
>
>
> I’ll take a look at this later today.
>
>
>
> Frank
>
>
>
> *From:* Malahal Naineni [mailto:mala...@gmail.com]
> *Sent:* Wednesday, August 16, 2017 11:34 PM
> *To:* Matt Benjamin <mbenj...@redhat.com>
> *Cc:* Frank Filz <ffilz...@mindspring.com>; Soumya Koduri <
> skod...@redhat.com>; nfs-ganesha-devel <nfs-ganesha-devel@lists.
> sourceforge.net>
>
>
> *Subject:* Re: [Nfs-ganesha-devel] Proposed backports for 2.5.2
>
>
>
> Dan, I backported everything that was needed except the following 2 as I
> don't want to mess with cmake! Can you please quickly send ported patches?
> Appreciate your help. The latest V2.5 code is at my personal github branch
> V2.5-stable:
>
>
>
> https://github.com/malahal/nfs-ganesha/commits/V2.5-stable
>
>
>
> The following 2 commits failed to apply:
>
>
>
> 6bd32da613e26a768ac1dc4db1001395bd10c295 CMake - Have 'make dist'
> generate the correct tarball name
>
> ff98ea64b6d1228443a35b2f7ceb3c61c0a0c1d1 Build libntirpc package when not
> using system ntirpc
>
>
>
>
>
>
>
> On Wed, Aug 16, 2017 at 10:47 PM, Matt Benjamin <mbenj...@redhat.com>
> wrote:
>
> Hi Frank,
>
> On Wed, Aug 16, 2017 at 1:11 PM, Frank Filz <ffilz...@mindspring.com>
> wrote:
> > Oh, nice.
>
> >
> >
> > Matt, what about this one?
> >
> >
> >
> > 814e9cd65 FSAL_RGW: adopt new rgw_mount2 with bucket specified
>
> RHCS doesn't officially support this, but I'd say it would be nice to have.
>
> Matt
>
>
> >
> >
> >
> > Frank
> >
> >
> >
> >
> >
> > From: Malahal Naineni [mailto:mala...@gmail.com]
> > Sent: Wednesday, August 16, 2017 9:28 AM
> > To: Soumya Koduri <skod...@redhat.com>
> > Cc: Frank Filz <ffilz...@mindspring.com>; d...@redhat.com; Matt Benjamin
> > <mbenj...@redhat.com>; nfs-ganesha-devel
> > <nfs-ganesha-devel@lists.sourceforge.net>
> > Subject: Re: [Nfs-ganesha-devel] Proposed backports for 2.5.2
> >
> >
> >
> > I pushed a notes branch "refs/notes/backport" which has a note saying
> > "backport to V2.5". You should be able to fetch this special branch with
> > "git fetch origin refs/notes/*:refs/notes/*". After fetching this special
> > branch, you should do "export GIT_NOTES_REF=refs/notes/backport" in your
> > SHELL and then run the usual "git log" to see if I missed any commits you
> > are interested in.
> >
> >
> >
> > Alternatively, the following are the commits that will NOT be back
> ported.
> > Let me know if you need any of these. I will cherry pick things tomorrow
> and
> > publish the branch, if there are no comments...
> >
> >
> >
> > 00b9e0798 Revert "CMake - Have 'make dist' generate the correct tarball
> > name"
> >
> > 1b60d5df2 FSAL_MEM - fix UP thread init/cleanup
> >
> > 39119aab0 FSAL_GLUSTER: Use glfs_xreaddirplus_r for readdir
> >
> > 4b4e21ed9 Manpage - Fix installing manpages in RPM
> >
> > 814e9cd65 FSAL_RGW: adopt new rgw_mount2 with bucket specified
> >
> > b862fe360 SAL: extract fs logic from nfs4_recovery
> >
> > c29114162 Napalm dispatch plus plus
> >
> > c8bc40b69 CMake - Have 'make dist' generate the correct tarball name
> >
> > cb787a1cf SAL: introduce new recovery backend based on rados kv store
> >
> > eadfc762e New (empty) sample config
> >
> > eb4eea134 config: add new config options for rados_kv recovery backend
> >
> > fbc905015 cmake: make modulized recovery backends compile as modules
> >
> >
> >
> >
> >
> > On Fri, Aug 11, 2017 at 8:08 AM, Soumya Koduri <skod...@redhat.com>
> wrote:
> >
> >
> >> commit 7f2d461277521301a417ca368d3c7656edbfc903
> >> FSAL_GLUSTER: Reset caller_garray to NULL upon free
> >>
> >
> > Yes
> >
> > On 08/09/2017 08:57 PM, Frank Filz wrote:
> >
> > 39119aa Soumya Koduri FSAL_GLUSTER: Use glfs_xreaddirplus_r for
> > readdir
> >
> > Yes? No? It's sort of a new feature, but may be critical for some use
> cases.
> > I'd rather it go into stable than end up separately backported for
> > downstream.
> >
> >
> > Right..as it is more of a new feature, wrt upstream we wanted it to be
> part
> > of only 2.6 on wards so as not to break stable branch (in case if there
> are
> > nit issues).
> >
> > But yes we may end up back-porting to downstream if we do not rebase to
> 2.6
> > by then.
> >
> > Thanks,
> > Soumya
> >
> >
> >
> > ------------------------------------------------------------
> ------------------
> > Check out the vibrant tech community on one of the world's most
> > engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> > _______________________________________________
> > Nfs-ganesha-devel mailing list
> > Nfs-ganesha-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/nfs-ganesha-devel
> >
> >
> >
> >
>
> > Virus-free. www.avast.com
>
> >
> > ------------------------------------------------------------
> ------------------
> > Check out the vibrant tech community on one of the world's most
> > engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> > _______________________________________________
> > Nfs-ganesha-devel mailing list
> > Nfs-ganesha-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/nfs-ganesha-devel
> >
>
>
>
>
>
>
> <https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient&utm_term=icon>
>
> Virus-free. www.avast.com
> <https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient&utm_term=link>
>
>
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Nfs-ganesha-devel mailing list
Nfs-ganesha-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs-ganesha-devel