From: John Spray <jspray@redhat.com>
Date: Thu, 14 Aug 2014 13:44:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v0.85~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f10a1384eec6afe6be15b1fa7966c9bb8a69936f;p=ceph.git

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

f10a1384eec6afe6be15b1fa7966c9bb8a69936f