From: Gary Lowell <gary.lowell@inktank.com>
Date: Tue, 10 Dec 2013 21:00:14 +0000 (+0000)
Subject: Merge branch 'next'
X-Git-Tag: v0.74~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5a02c33e23e4fbdc7bf0f16a5bbff61f4e37186;p=ceph.git

Merge branch 'next'
---

e5a02c33e23e4fbdc7bf0f16a5bbff61f4e37186