From: John Wilkins <john.wilkins@inktank.com>
Date: Fri, 8 Nov 2013 18:23:23 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.74~37^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c91ea1437aaa591ba02f7e722622f24ff345a29;p=ceph.git

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

3c91ea1437aaa591ba02f7e722622f24ff345a29