From: Sage Weil <sage@newdream.net>
Date: Thu, 5 Apr 2012 21:08:04 +0000 (-0700)
Subject: Merge branch 'wip-cluster'
X-Git-Tag: v0.46~120
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=90e88a0832eaed6ee2e6bb9180f3211f13287c35;p=ceph.git

Merge branch 'wip-cluster'

Reviewed-by: Yehuda Sadeh <yehuda.sadeh@dreamhost.com>
---

90e88a0832eaed6ee2e6bb9180f3211f13287c35