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

Merge branch 'wip-mon-trim'

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
---

8bdd86a12d7a6a7b790a53a69e73d4b9190235bb