From: Sage Weil <sage@redhat.com>
Date: Mon, 23 Nov 2015 14:01:30 +0000 (-0500)
Subject: Merge branch 'master' of github.com:ceph/ceph
X-Git-Tag: v10.0.1~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4694f6a8e00ce6452b07bb8c318ade3bc24173d;p=ceph.git

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

d4694f6a8e00ce6452b07bb8c318ade3bc24173d