From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 21 Jul 2017 20:22:53 +0000 (-0700)
Subject: Merge PR 16232 into master
X-Git-Tag: v12.1.2~175
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11d809e9fe85cf2b1d5c1ff70245aa4d02c4bfdd;p=ceph-ci.git

Merge PR 16232 into master

* refs/remotes/upstream/pull/16232/head:
	MDS: update the mlogger of mds in function check_memory_usage

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

11d809e9fe85cf2b1d5c1ff70245aa4d02c4bfdd