From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 18 Jul 2017 05:33:36 +0000 (-0700)
Subject: Merge PR 15981 into master
X-Git-Tag: ses5-milestone9~1^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39b0bde69afb9bb383837d073a377ddf8312d8ec;p=ceph.git

Merge PR 15981 into master

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

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

39b0bde69afb9bb383837d073a377ddf8312d8ec