From: Sage Weil <sage@inktank.com>
Date: Fri, 21 Mar 2014 21:52:20 +0000 (-0700)
Subject: Merge pull request #1485 from ceph/wip-7212.dumpling
X-Git-Tag: v0.67.8~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ef0d6a25bf8c0cfb38768c157c29ba52295f3ca;p=ceph.git

Merge pull request #1485 from ceph/wip-7212.dumpling

backport 7212 fixes to dumpling
---

2ef0d6a25bf8c0cfb38768c157c29ba52295f3ca