From: Samuel Just <sam.just@inktank.com>
Date: Mon, 29 Apr 2013 17:45:20 +0000 (-0700)
Subject: Merge branch 'wip_4836' into next
X-Git-Tag: v0.61~53
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8f762a2814dc778da7027998126b60bd260d099;p=ceph.git

Merge branch 'wip_4836' into next

Fixes: #4836
Reviewed-by: Sage Weil <sage@inktank.com>
---

f8f762a2814dc778da7027998126b60bd260d099