]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b1a229 449c0b3)
Merge PR 15981 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Jul 2017 05:33:36 +0000 (22:33 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Jul 2017 05:33:36 +0000 (22:33 -0700)
* refs/remotes/upstream/pull/15981/head:
mds: reinstate daemonperf counters

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/MDCache.cc patch | diff1 | diff2 | blob | history
src/mds/Server.cc patch | diff1 | diff2 | blob | history

diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.