From: Sage Weil <sage@inktank.com>
Date: Tue, 30 Jul 2013 23:55:21 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.68~115
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3fa1cd20b5d091ec997cf15251586d77f3cf079b;p=ceph.git

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

3fa1cd20b5d091ec997cf15251586d77f3cf079b