From: Sage Weil <sage.weil@dreamhost.com>
Date: Wed, 23 Nov 2011 14:45:26 +0000 (-0800)
Subject: Merge branch 'wip-mon'
X-Git-Tag: v0.39~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=32a6837839acd7bf7135e356b45a8636140f8eb1;p=ceph.git

Merge branch 'wip-mon'
---

32a6837839acd7bf7135e356b45a8636140f8eb1