From: Sage Weil <sage@inktank.com>
Date: Mon, 17 Jun 2013 22:46:47 +0000 (-0700)
Subject: Merge branch 'wip-5194' into next
X-Git-Tag: v0.65~48
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=910af074fc4da6ecf3a59e8049257e6d4db6be3e;p=ceph.git

Merge branch 'wip-5194' into next

Reviewed-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
---

910af074fc4da6ecf3a59e8049257e6d4db6be3e