From: Sage Weil <sage@redhat.com>
Date: Tue, 5 May 2015 16:53:51 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v9.0.1~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f209b4bc8a55bfe9741121c3ade3f256bbe74f8;p=ceph.git

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

7f209b4bc8a55bfe9741121c3ade3f256bbe74f8