From: Yehuda Sadeh <yehuda@inktank.com>
Date: Wed, 11 Sep 2013 16:47:10 +0000 (-0700)
Subject: Merge branch 'wip-6078-dumpling' into dumpling
X-Git-Tag: v0.67.4~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a304016fa01b02efd500135c00b9bf3407a9999c;p=ceph.git

Merge branch 'wip-6078-dumpling' into dumpling

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

a304016fa01b02efd500135c00b9bf3407a9999c