From: Sage Weil <sage@inktank.com>
Date: Tue, 20 Aug 2013 05:53:28 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.69~90
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=928a0d42707ca2aaa69cd47f686a2ad846bc7eeb;p=ceph.git

Merge remote-tracking branch 'gh/next'
---

928a0d42707ca2aaa69cd47f686a2ad846bc7eeb