From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Aug 2014 19:22:31 +0000 (-0700)
Subject: Merge branch 'wip-8860'
X-Git-Tag: v0.85~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce7cd60a44c1e640837fdbacb020b99d545bf23c;p=ceph.git

Merge branch 'wip-8860'

Reviewed-by: Sage Weil <sage@redhat.com>
---

ce7cd60a44c1e640837fdbacb020b99d545bf23c