From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 13 Mar 2018 23:15:13 +0000 (-0700)
Subject: Merge PR #20881 into master
X-Git-Tag: v13.1.0~574
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76080ed795868a4e153d7659879d847d22e8fc54;p=ceph.git

Merge PR #20881 into master

* refs/pull/20881/head:
	messages/MClientRequest: fix a typo so we don't output 'setfilelockrule' in logs

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

76080ed795868a4e153d7659879d847d22e8fc54