From: Sage Weil <sage@redhat.com>
Date: Fri, 11 Jul 2014 21:56:40 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.84~120
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49e5c8ec88eab095c1e271fc48a807573aff9f04;p=ceph.git

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

49e5c8ec88eab095c1e271fc48a807573aff9f04