From: Sage Weil <sage@inktank.com>
Date: Sat, 8 Feb 2014 16:23:12 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.78~212
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5bc8e9e40292a653a4f208b813e7613bb9d17d90;p=ceph.git

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

5bc8e9e40292a653a4f208b813e7613bb9d17d90