From: Sage Weil <sage@redhat.com>
Date: Fri, 11 Mar 2016 16:14:55 +0000 (-0500)
Subject: Merge branch 'master' of github.com:ceph/ceph
X-Git-Tag: v10.1.0~147
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8733c40ef5beef943499f4beb46950f95bb59946;p=ceph.git

Merge branch 'master' of github.com:ceph/ceph
---

8733c40ef5beef943499f4beb46950f95bb59946