From: Sage Weil <sage@redhat.com>
Date: Thu, 28 Aug 2014 17:59:40 +0000 (-0700)
Subject: Merge branch 'wip-8639'
X-Git-Tag: v0.86~190
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc1186a20b39bba1d3dbb94e34b515035401ee10;p=ceph.git

Merge branch 'wip-8639'

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
---

fc1186a20b39bba1d3dbb94e34b515035401ee10