From: Sage Weil <sage@inktank.com>
Date: Tue, 5 Mar 2013 21:33:05 +0000 (-0800)
Subject: Merge branch 'wip-prepare'
X-Git-Tag: v0.59~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8184b68c37f1a2c9303e13caeaad0eccd5678ab6;p=ceph.git

Merge branch 'wip-prepare'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Alexandre Marangone <alexandre.marangone@inktank.com>
Tested-by: Tamil Muthamizhan <tamil.muthamizhan@inktank.com>
---

8184b68c37f1a2c9303e13caeaad0eccd5678ab6