From: Samuel Just <sam.just@inktank.com>
Date: Fri, 8 Mar 2013 20:44:42 +0000 (-0800)
Subject: Merge branch 'wip-osd-map' into next
X-Git-Tag: v0.59~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=31a110c5d0ff5ffa1668589067e6f59249f02500;p=ceph.git

Merge branch 'wip-osd-map' into next

Fixes: 4369
Backport: bobtail
Reviewed-by: Samuel Just <sam.just@inktank.com>
---

31a110c5d0ff5ffa1668589067e6f59249f02500