From: John Wilkins <john.wilkins@inktank.com>
Date: Fri, 14 Mar 2014 22:53:10 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/ceph/ceph
X-Git-Tag: v0.79~142
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5322ecb20ba62dc05574e94cde4553dfe29b91e0;p=ceph.git

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

5322ecb20ba62dc05574e94cde4553dfe29b91e0