From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 7 Sep 2017 04:05:20 +0000 (-0700)
Subject: Merge PR #17340 into master
X-Git-Tag: v13.0.1~1020
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9994788ca4aaee5c6cb3090fc4a000ef1513a0b;p=ceph.git

Merge PR #17340 into master

* refs/remotes/upstream/pull/17340/head:
	mds: void sending cap import message when inode is frozen
	client: fix message order check in handle_cap_export()

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

c9994788ca4aaee5c6cb3090fc4a000ef1513a0b