From: Noah Watkins Date: Thu, 14 Mar 2013 20:27:27 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/wip-osd-addr-api' X-Git-Tag: v0.60~70 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1cbcc044673d30a940f1b7415f19f0dcf1430511;p=ceph.git Merge remote-tracking branch 'origin/wip-osd-addr-api' Reviewed-by: Sage Weil --- 1cbcc044673d30a940f1b7415f19f0dcf1430511