]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit39b0bde69afb9bb383837d073a377ddf8312d8ec
treea7d79feb7fd98776e0c60307c098d4ec995883b4
parent5b1a229fca30c84ae9cb86a6a855334da9fe2120
parent449c0b35650f1a33df1fd704ffb382586109df22
Merge PR 15981 into master

* refs/remotes/upstream/pull/15981/head:
mds: reinstate daemonperf counters

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
src/mds/MDCache.cc
src/mds/Server.cc