From: Sage Weil <sage@redhat.com>
Date: Mon, 24 Aug 2015 12:35:38 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v10.2.6~165^2^2~405
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2daae6aa70ccb0f2ee8ec602f9d74b69cdf8a95;p=ceph.git

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

b2daae6aa70ccb0f2ee8ec602f9d74b69cdf8a95