From: liupan1111 <liupan1111@users.noreply.github.com>
Date: Tue, 1 Nov 2016 10:59:40 +0000 (+0800)
Subject: Merge pull request #2 from ceph/master
X-Git-Tag: v11.1.0~417^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3d769249880419e8a700d7a152b9e06ab351a7ec;p=ceph-ci.git

Merge pull request #2 from ceph/master

rebase new code
---

3d769249880419e8a700d7a152b9e06ab351a7ec