]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #11335 from linuxbox2/jewel-nfs
authorMatt Benjamin <mbenjamin@redhat.com>
Mon, 10 Oct 2016 14:46:33 +0000 (10:46 -0400)
committerGitHub <noreply@github.com>
Mon, 10 Oct 2016 14:46:33 +0000 (10:46 -0400)
jewel: rgw: nfs backports

1  2 
src/common/config_opts.h
src/rgw/librgw.cc
src/rgw/rgw_file.h

Simple merge
Simple merge
Simple merge