From: Josh Durgin <josh.durgin@inktank.com>
Date: Sat, 28 Sep 2013 00:06:04 +0000 (-0700)
Subject: Merge pull request #657 from ceph/wip-6397
X-Git-Tag: mark-v0.70-wip~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd566a4c0e076d373383c81e341056915a4b2a44;p=ceph.git

Merge pull request #657 from ceph/wip-6397

Wip 6397

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

cd566a4c0e076d373383c81e341056915a4b2a44