From: Sage Weil <sage.weil@dreamhost.com>
Date: Sat, 31 Mar 2012 03:31:30 +0000 (-0700)
Subject: Merge remote branch 'gh/wip-mon_setup'
X-Git-Tag: v0.45~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dbc70b9db52540d541d51db8969a5b710b271bd2;p=ceph.git

Merge remote branch 'gh/wip-mon_setup'

Reviewed-by: Sage Weil <sage@newdream.net>
---

dbc70b9db52540d541d51db8969a5b710b271bd2