From: Yehuda Sadeh <yehuda@inktank.com>
Date: Wed, 4 Sep 2013 23:18:38 +0000 (-0700)
Subject: Merge branch 'wip-6078' into next
X-Git-Tag: v0.69~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea412c05f61e54c7a6749ca0b699e5fcbafa6191;p=ceph.git

Merge branch 'wip-6078' into next

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

ea412c05f61e54c7a6749ca0b699e5fcbafa6191