From: Sage Weil <sage@inktank.com>
Date: Tue, 9 Jul 2013 20:43:25 +0000 (-0700)
Subject: Merge branch 'wip-mon-osdmap-trim'
X-Git-Tag: v0.67-rc1~131
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae866426caf092963d029bd00d40ee7669dd1cb5;p=ceph.git

Merge branch 'wip-mon-osdmap-trim'

Reviewed-by: Samuel Just <sam.just@inktank.com>
---

ae866426caf092963d029bd00d40ee7669dd1cb5