From: Jenkins <jenkins@ceph.com>
Date: Tue, 13 Oct 2015 20:57:16 +0000 (-0700)
Subject: Merge branch 'infernalis' of jenkins.front.sepia.ceph.com:ceph/ceph into infernalis
X-Git-Tag: v9.2.0~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=666c12da12223a3292e19d29e68006977f3fdb82;p=ceph.git

Merge branch 'infernalis' of jenkins.front.sepia.ceph.com:ceph/ceph into infernalis
---

666c12da12223a3292e19d29e68006977f3fdb82