From: Sage Weil <sage@redhat.com>
Date: Fri, 25 May 2018 18:27:58 +0000 (-0500)
Subject: Merge PR #22230 into master
X-Git-Tag: v14.0.0~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d45d7e4ed76e6561565eb487bb3a16699aacb56;p=ceph.git

Merge PR #22230 into master

* refs/pull/22230/head:
	test/cli-integration/rbd: fixed unit formatting
	qa/workunits/rbd: fix unit formatting tests
	librbd: clones should not inherit implicit feature bits from parent

Reviewed-by: Mykola Golub <mgolub@suse.com>
---

0d45d7e4ed76e6561565eb487bb3a16699aacb56