From: Sage Weil <sage@redhat.com>
Date: Mon, 6 Oct 2014 22:52:24 +0000 (-0700)
Subject: Merge branch 'wip-9658' into giant
X-Git-Tag: v0.86~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=260933b1107182e37ef30593134dfea415fb3a3b;p=ceph.git

Merge branch 'wip-9658' into giant
---

260933b1107182e37ef30593134dfea415fb3a3b