From: Samuel Just <sjust@redhat.com>
Date: Thu, 1 Oct 2015 21:55:37 +0000 (-0700)
Subject: Merge remote-tracking branch 'jdurgin/wip-13281' into infernalis
X-Git-Tag: v9.1.0~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c089ee93f4fd307d4d45493796f53a13dcc4c5b;p=ceph.git

Merge remote-tracking branch 'jdurgin/wip-13281' into infernalis

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

4c089ee93f4fd307d4d45493796f53a13dcc4c5b