From: Nathan Cutler <presnypreklad@gmail.com>
Date: Fri, 29 Jul 2016 07:22:43 +0000 (+0200)
Subject: Merge pull request #1104 from smithfarm/wip-16847
X-Git-Tag: v0.94.10~27^2^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4872ecadf92cfc108c3f230fbc40a6081214f66;p=ceph.git

Merge pull request #1104 from smithfarm/wip-16847

Wip 16847

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

d4872ecadf92cfc108c3f230fbc40a6081214f66