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

Merge branch 'wip_4860' into next

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
---

2b5dda0e6a31adf952ca486a53b899ef8d1ebfa1