From: David Zafman <david.zafman@inktank.com>
Date: Fri, 14 Mar 2014 22:26:43 +0000 (-0700)
Subject: Merge pull request #1463 from ceph/wip-7698
X-Git-Tag: v0.79~142^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c6214f865524ab5b8f958baae1a02fb0acd4b913;p=ceph.git

Merge pull request #1463 from ceph/wip-7698

Reviewed-by: Samuel Just <sam.just@inktank.com>
---

c6214f865524ab5b8f958baae1a02fb0acd4b913