From: Sage Weil <sage@inktank.com>
Date: Mon, 23 Sep 2013 21:12:33 +0000 (-0700)
Subject: Merge pull request #599 from ceph/wip-6323
X-Git-Tag: mark-v0.70-wip~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=da42355a6d8ef7197ae6f9f3bef2eb6f9f8ca9cb;p=ceph.git

Merge pull request #599 from ceph/wip-6323

mon: OSDMonitor: fix #6322 and #6323

Reviewed-by: Greg Farnum <greg@inktank.com>
---

da42355a6d8ef7197ae6f9f3bef2eb6f9f8ca9cb