From: Sage Weil <sage@inktank.com>
Date: Mon, 15 Jul 2013 20:20:32 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.67-rc1~79
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2bf95e5a1c8dffed23bfebc7f55d7d5eea40080b;p=ceph.git

Merge branch 'next'
---

2bf95e5a1c8dffed23bfebc7f55d7d5eea40080b