From: Sage Weil <sage@redhat.com>
Date: Sun, 18 Jan 2015 18:42:31 +0000 (-0800)
Subject: Merge pull request #3315 from majianpeng/fix6
X-Git-Tag: v0.93~260
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7f9bffa5065167d2388f561f55255c85b276fed;p=ceph.git

Merge pull request #3315 from majianpeng/fix6

bug fix

Reviewed-by: Sage Weil <sage@redhat.com>
---

e7f9bffa5065167d2388f561f55255c85b276fed