From: Orit Wasserman <owasserm@redhat.com>
Date: Mon, 6 Jul 2015 19:50:29 +0000 (+0200)
Subject: Merge pull request #5108 from ceph/wip-12079
X-Git-Tag: v9.0.2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f567120ccea56731da707f23dcbafc482206e92b;p=ceph.git

Merge pull request #5108 from ceph/wip-12079

Wip 12079
---

f567120ccea56731da707f23dcbafc482206e92b