From: Yan, Zheng <ukernel@gmail.com>
Date: Sat, 20 Sep 2014 03:51:36 +0000 (+0800)
Subject: Merge pull request #2431 from ceph/wip-6613
X-Git-Tag: v0.88~161
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7fe6e10544ac077f3937b67353b38394cec5ece4;p=ceph.git

Merge pull request #2431 from ceph/wip-6613

Wip 9178
---

7fe6e10544ac077f3937b67353b38394cec5ece4