From: Gary Lowell <gary.lowell@inktank.com>
Date: Tue, 4 Dec 2012 05:31:14 +0000 (-0800)
Subject: Merge branch 'master' of http://github.com/ceph/ceph
X-Git-Tag: v0.56~118
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2eee9e175e5797f9bb8f695cfdbfbe49b4befee9;p=ceph.git

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

2eee9e175e5797f9bb8f695cfdbfbe49b4befee9