From: Sage Weil <sage@inktank.com>
Date: Mon, 17 Feb 2014 19:07:55 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/wip-7212-sage-b'
X-Git-Tag: v0.78~168
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a4ca4a73475db8a1e502f3f5394382da7a36a280;p=ceph.git

Merge remote-tracking branch 'gh/wip-7212-sage-b'

We should carefully backport some or all of this.

Backport: emperor, dumpling
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
---

a4ca4a73475db8a1e502f3f5394382da7a36a280