From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 19 Mar 2019 14:31:33 +0000 (+0100)
Subject: Merge PR #27042 into master
X-Git-Tag: v15.0.0~207
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=532bb2004bd906c57d78aa475207c5728e594a36;p=ceph-ci.git

Merge PR #27042 into master

* refs/pull/27042/head:
	qa: add krbd_discard_granularity.t test
	qa: update and rename krbd_discard_1b.t

Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

532bb2004bd906c57d78aa475207c5728e594a36