From: Samuel Just <sam.just@inktank.com>
Date: Fri, 29 May 2015 22:17:22 +0000 (-0700)
Subject: Merge pull request #451 from athanatos/wip-11677
X-Git-Tag: v10.2.6~165^2^2~466
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5cb2631e7cf97c12e91de83fcaa37c645647bce0;p=ceph.git

Merge pull request #451 from athanatos/wip-11677

Wip 11677

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

5cb2631e7cf97c12e91de83fcaa37c645647bce0