From: Sage Weil <sage@inktank.com>
Date: Tue, 12 Jun 2012 19:48:37 +0000 (-0700)
Subject: Merge branch 'wip-keyrings'
X-Git-Tag: v0.48argonaut~74
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9390bb4950f2783cd40b19ea7c2c07eae05a10d;p=ceph.git

Merge branch 'wip-keyrings'

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

e9390bb4950f2783cd40b19ea7c2c07eae05a10d