From: Sage Weil <sage@inktank.com>
Date: Thu, 23 May 2013 15:45:55 +0000 (-0700)
Subject: Merge pull request #307 from xiaoxichen/master
X-Git-Tag: v0.64~64
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2802430af7d79cbb4d3c560f3a0cd8c72fdd774a;p=ceph.git

Merge pull request #307 from xiaoxichen/master

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

2802430af7d79cbb4d3c560f3a0cd8c72fdd774a