From: Sage Weil <sage@redhat.com>
Date: Fri, 11 Mar 2016 17:07:55 +0000 (-0500)
Subject: Merge tag 'v10.0.5'
X-Git-Tag: v10.1.0~146
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96c1da9cd1bd4c56a2293f5ce050c45683d7dd40;p=ceph.git

Merge tag 'v10.0.5'

v10.0.5

Conflicts:
	debian/changelog
---

96c1da9cd1bd4c56a2293f5ce050c45683d7dd40