From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 10 Feb 2016 19:15:49 +0000 (-0800)
Subject: Merge branch 'wip-11642-0203'
X-Git-Tag: v10.1.0~412
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d36bc792bec486bf831a3b6cdf154d455d3cfaa;p=ceph.git

Merge branch 'wip-11642-0203'
---

4d36bc792bec486bf831a3b6cdf154d455d3cfaa