From: Sage Weil <sage@inktank.com>
Date: Mon, 14 May 2012 18:34:03 +0000 (-0700)
Subject: Merge branch 'wip-osdmap'
X-Git-Tag: v0.47~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84f335a6894db6d6b993d9cba584b4c3ab5365d0;p=ceph.git

Merge branch 'wip-osdmap'

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

84f335a6894db6d6b993d9cba584b4c3ab5365d0