From: John Wilkins <john.wilkins@inktank.com>
Date: Tue, 6 Nov 2012 17:14:11 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.55~193^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a1ee028d6ddb23072f27ab7fb898b1ae7f4273f;p=ceph.git

Merge branch 'master' of https://github.com/ceph/ceph
---

9a1ee028d6ddb23072f27ab7fb898b1ae7f4273f