From: Sage Weil <sage@inktank.com>
Date: Fri, 1 Nov 2013 23:08:14 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.73~48
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1671d7e8d5614e10d483cb128cd86880ee35cab2;p=ceph.git

Merge branch 'next'
---

1671d7e8d5614e10d483cb128cd86880ee35cab2