]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'gh/wip-admin'
authorSage Weil <sage@inktank.com>
Thu, 31 May 2012 03:38:22 +0000 (20:38 -0700)
committerSage Weil <sage@inktank.com>
Thu, 31 May 2012 03:38:22 +0000 (20:38 -0700)
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>

Trivial merge