From: Sage Weil <sage@redhat.com>
Date: Tue, 19 Aug 2014 04:10:32 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.85~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=92b227e1c0b1533c359e74c81de58140b483ee8e;p=ceph.git

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

92b227e1c0b1533c359e74c81de58140b483ee8e