From: Sage Weil <sage@redhat.com>
Date: Sun, 31 May 2015 16:43:33 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v9.0.2~80
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c8705e5ae50a4bc3d13489febca03d0ba6395c35;p=ceph.git

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

c8705e5ae50a4bc3d13489febca03d0ba6395c35