From: Sage Weil <sage@newdream.net>
Date: Mon, 7 May 2012 16:25:12 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-osd-peering'
X-Git-Tag: v0.47~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=efc0701cf97f6a936c8f253b5449216f309fe4a3;p=ceph.git

Merge remote-tracking branch 'gh/wip-osd-peering'

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

efc0701cf97f6a936c8f253b5449216f309fe4a3