From: John Wilkins <john.wilkins@inktank.com>
Date: Thu, 10 Jul 2014 18:30:41 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.84~126
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60f27a2602b5efca424a0ee96676ef264ca78270;p=ceph.git

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

60f27a2602b5efca424a0ee96676ef264ca78270