From: Sage Weil <sage@inktank.com>
Date: Mon, 24 Feb 2014 03:49:18 +0000 (-0800)
Subject: Merge pull request #1307 from ceph/wip-7517
X-Git-Tag: v0.78~122
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f53cf132b7b45ee93026616b0044eb558a373bf;p=ceph.git

Merge pull request #1307 from ceph/wip-7517

Wip 7517
---

5f53cf132b7b45ee93026616b0044eb558a373bf