From: Josh Durgin <josh.durgin@inktank.com>
Date: Tue, 28 Jan 2014 02:14:36 +0000 (-0800)
Subject: Merge pull request #1105 from ceph/wip-7168
X-Git-Tag: v0.78~267
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b135128095e6c7025cbe77f7e23dd0937bdd0537;p=ceph.git

Merge pull request #1105 from ceph/wip-7168

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

b135128095e6c7025cbe77f7e23dd0937bdd0537