From: Ken Dreyer <ken.dreyer@inktank.com>
Date: Mon, 3 Feb 2014 22:39:26 +0000 (+0000)
Subject: Merge branch 'next'
X-Git-Tag: v0.78~232
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9b9f524204e4d1459e35cdf4cfa17fc3e854cf2;p=ceph.git

Merge branch 'next'
---

f9b9f524204e4d1459e35cdf4cfa17fc3e854cf2