From: Samuel Just <sjust@redhat.com>
Date: Wed, 15 Jun 2016 20:48:58 +0000 (-0700)
Subject: Merge pull request #1055 from ceph/wip-fix-core-master
X-Git-Tag: v11.1.1~58^2^2~172
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c65ba2fa6549ade9028bc67f538aa5a0ed51660d;p=ceph.git

Merge pull request #1055 from ceph/wip-fix-core-master

16334 and 16332 fixes

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

c65ba2fa6549ade9028bc67f538aa5a0ed51660d