From: Sage Weil <sage@redhat.com>
Date: Sun, 13 Sep 2015 11:45:30 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v9.1.0~147
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=770a573b0b8c19bb7b5c2506c6824f4ced9dc1d3;p=ceph.git

Merge remote-tracking branch 'gh/infernalis'
---

770a573b0b8c19bb7b5c2506c6824f4ced9dc1d3