From: Sage Weil <sage@inktank.com>
Date: Sat, 24 Nov 2012 17:16:13 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/wip-mon-misc-fixes' into next
X-Git-Tag: v0.55~57
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a03d50146bdad346d984e6a6061146aef23a154;p=ceph.git

Merge remote-tracking branch 'gh/wip-mon-misc-fixes' into next
---

8a03d50146bdad346d984e6a6061146aef23a154