From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Nov 2014 00:22:40 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.89~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=80865fea7143402648769ff9f9c6fcae7900222c;p=ceph.git

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

80865fea7143402648769ff9f9c6fcae7900222c