From: Yehuda Sadeh Date: Fri, 6 Jun 2014 15:45:58 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/wip-8269-dumpling' into dumpling X-Git-Tag: v0.67.10~39 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=95a464a443e3a249889151807065736fff44ea3a;p=ceph.git Merge remote-tracking branch 'origin/wip-8269-dumpling' into dumpling Reviewed-by: Josh Durgin --- 95a464a443e3a249889151807065736fff44ea3a