From: David Zafman <dzafman@redhat.com>
Date: Wed, 4 May 2016 16:38:56 +0000 (-0700)
Subject: Merge pull request #982 from ceph/wip-13507
X-Git-Tag: v11.1.1~58^2^2~215
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51093a3384237abb2e76142adee296be58cf6d57;p=ceph.git

Merge pull request #982 from ceph/wip-13507

Changes for wip-13507 and test fixes

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

51093a3384237abb2e76142adee296be58cf6d57