From: Sage Weil <sage@redhat.com>
Date: Mon, 24 Nov 2014 02:55:32 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.90~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47bc8da32952dd0617de6cf9e4f7d4d22ba4cf40;p=ceph.git

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

47bc8da32952dd0617de6cf9e4f7d4d22ba4cf40