From: Sage Weil <sage@inktank.com>
Date: Thu, 31 May 2012 03:38:22 +0000 (-0700)
Subject: Merge remote branch 'gh/wip-admin'
X-Git-Tag: v0.48argonaut~155^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=640eec9cd030934a91d9cdcb9ff587f909fb8e73;p=ceph.git

Merge remote branch 'gh/wip-admin'

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
---

640eec9cd030934a91d9cdcb9ff587f909fb8e73