From: Sage Weil <sage@inktank.com>
Date: Fri, 4 May 2012 03:43:54 +0000 (-0700)
Subject: Merge branch 'wip-osd-uuid'
X-Git-Tag: v0.47~48
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=720bea4a71a3a88fc89c884f35b366f3a79e8adb;p=ceph.git

Merge branch 'wip-osd-uuid'

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

720bea4a71a3a88fc89c884f35b366f3a79e8adb