From: Sage Weil <sage@inktank.com>
Date: Tue, 4 Feb 2014 06:20:47 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.78~227
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a8fcffb9ada527d2f6695552ccc9305d98802f2b;p=ceph.git

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

a8fcffb9ada527d2f6695552ccc9305d98802f2b