From: Sage Weil <sage@redhat.com>
Date: Wed, 16 Jul 2014 22:28:10 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.84~99
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf252c8df9d77ae8f144ec5b826e773b20273695;p=ceph.git

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

bf252c8df9d77ae8f144ec5b826e773b20273695