From: Ken Dreyer <ken.dreyer@inktank.com>
Date: Tue, 14 Jan 2014 16:16:41 +0000 (+0000)
Subject: Merge branch 'next'
X-Git-Tag: v0.77~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03d7d97d5df4e0fca24fdff360f1bde6fcefddfc;p=ceph.git

Merge branch 'next'
---

03d7d97d5df4e0fca24fdff360f1bde6fcefddfc