From: John Spray <john.spray@redhat.com>
Date: Wed, 3 Sep 2014 12:52:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v0.86~149
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=eadc352d4557d18eec0a854a479f512fb1357c58;p=ceph.git

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

eadc352d4557d18eec0a854a479f512fb1357c58