From: Sage Weil <sage@redhat.com>
Date: Fri, 12 Dec 2014 14:22:06 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.92~61^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc382d108a900edcbef7efa62d611e630e385676;p=ceph.git

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

cc382d108a900edcbef7efa62d611e630e385676