From: John Wilkins Date: Mon, 28 Apr 2014 17:33:47 +0000 (-0700) Subject: Merge branch 'master' of https://github.com/ceph/ceph into wip-doc-radosgw X-Git-Tag: v0.81~70^2~9 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c511894e9d1942da5e4b69aa560f154a1f137395;p=ceph.git Merge branch 'master' of https://github.com/ceph/ceph into wip-doc-radosgw --- c511894e9d1942da5e4b69aa560f154a1f137395