From: David Zafman <david.zafman@inktank.com>
Date: Fri, 22 Feb 2013 20:49:47 +0000 (-0800)
Subject: Merge branch 'wip-3403-4-rebase'
X-Git-Tag: v0.59~146
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d612a9abacdde1844725262fbbeba8578b767333;p=ceph.git

Merge branch 'wip-3403-4-rebase'

Feature: #3403

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
---

d612a9abacdde1844725262fbbeba8578b767333