From: David Zafman <dzafman@redhat.com>
Date: Thu, 14 May 2015 17:56:20 +0000 (-0700)
Subject: Merge pull request #402 from ceph/wip-11343
X-Git-Tag: v10.2.6~165^2^2~476
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aaacfb8e4d9539f554c4850b66aec143e1ffeafd;p=ceph.git

Merge pull request #402 from ceph/wip-11343

Reviewed-by: Samuel Just <sjust@redhat.com>
---

aaacfb8e4d9539f554c4850b66aec143e1ffeafd