]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d83240 4508a4d)
Merge PR #24747 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 1 Nov 2018 21:53:25 +0000 (14:53 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 1 Nov 2018 21:53:25 +0000 (14:53 -0700)
* refs/pull/24747/head:
client: add new routine to get fscid from a ceph_mount

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/client/Client.cc patch | diff1 | diff2 | blob | history
src/client/Client.h patch | diff1 | diff2 | blob | history

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