From: Sage Weil <sage@redhat.com>
Date: Mon, 7 Mar 2016 20:58:44 +0000 (-0500)
Subject: Merge branch 'master' of github.com:ceph/ceph
X-Git-Tag: v10.1.0~216
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=796331d6a17b4f5ea6f133ed2b56d5780cbcf6f1;p=ceph-ci.git

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

796331d6a17b4f5ea6f133ed2b56d5780cbcf6f1