From: Sage Weil <sage@inktank.com>
Date: Sat, 31 Aug 2013 17:31:31 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.69~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c7f2def8aa8a384ea6c303ad218ed0a39efe316d;p=ceph.git

Merge branch 'next'
---

c7f2def8aa8a384ea6c303ad218ed0a39efe316d