From: zhanglei <243290414@qq.com>
Date: Mon, 12 Jun 2017 01:23:34 +0000 (-0400)
Subject: Merge branch 'ceph' into zl
X-Git-Tag: v12.1.0~160^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=79eb8300144b12c71d3277f354f8126278666e84;p=ceph-ci.git

Merge branch 'ceph' into zl
---

79eb8300144b12c71d3277f354f8126278666e84