From: Sage Weil <sage@inktank.com>
Date: Sun, 9 Feb 2014 18:37:47 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/wip-7329' into next
X-Git-Tag: v0.77~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39b393d7fa0e66c6e7a73ce6b5b45bbf3bb6980a;p=ceph.git

Merge remote-tracking branch 'gh/wip-7329' into next
---

39b393d7fa0e66c6e7a73ce6b5b45bbf3bb6980a