From: David Zafman <dzafman@redhat.com>
Date: Wed, 13 May 2015 20:10:39 +0000 (-0700)
Subject: Merge pull request #4473 from ceph/wip-10809-11135-10290
X-Git-Tag: v9.0.2~168
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=00c4fc890737b0c57224d223d002d02e94ef097b;p=ceph.git

Merge pull request #4473 from ceph/wip-10809-11135-10290


Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
---

00c4fc890737b0c57224d223d002d02e94ef097b