From: Samuel Just <sjust@redhat.com>
Date: Fri, 29 May 2015 21:17:42 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/wip-11493'
X-Git-Tag: v9.0.2~89
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a95f13a69397bc2c8ee7dbf13da99c9998ad7d2;p=ceph.git

Merge remote-tracking branch 'upstream/wip-11493'

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

8a95f13a69397bc2c8ee7dbf13da99c9998ad7d2