]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4386ce5 dea4ffe)
Merge PR #32315 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 15 Jan 2020 02:15:34 +0000 (18:15 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 15 Jan 2020 02:15:34 +0000 (18:15 -0800)
* refs/pull/32315/head:
client: disallow changing fuse_default_permissions option at runtime

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
1  2 
src/client/Client.cc patch | diff1 | diff2 | blob | history
src/common/options.cc patch | diff1 | diff2 | blob | history

diff --cc src/client/Client.cc
Simple merge
diff --cc src/common/options.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.