From: Josh Durgin <josh.durgin@inktank.com>
Date: Sat, 14 Jun 2014 01:24:19 +0000 (-0700)
Subject: Merge pull request #1949 from ceph/wip-7774-3
X-Git-Tag: v0.83~97
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82c547952dc9e7a3e9fab1264f5fdd903ab6973e;p=ceph.git

Merge pull request #1949 from ceph/wip-7774-3

Wip 7774 3

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

82c547952dc9e7a3e9fab1264f5fdd903ab6973e