From: John Wilkins Date: Tue, 29 Apr 2014 01:07:27 +0000 (-0700) Subject: Merge branch 'master' of https://github.com/ceph/ceph into wip-doc-radosgw X-Git-Tag: v0.81~70^2~8 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=150a1de4027d6f16b3e0aec341fa077bd34f4542;p=ceph.git Merge branch 'master' of https://github.com/ceph/ceph into wip-doc-radosgw --- 150a1de4027d6f16b3e0aec341fa077bd34f4542