From: Zack Cerza <zack@cerza.org>
Date: Thu, 27 Oct 2016 19:27:23 +0000 (-0600)
Subject: Merge pull request #1220 from ceph/wip-10235
X-Git-Tag: v11.1.1~58^2^2~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34fc504dd7c3b0b29362b48b36850aa7a949acbb;p=ceph.git

Merge pull request #1220 from ceph/wip-10235

Remove obsolete calamari code
---

34fc504dd7c3b0b29362b48b36850aa7a949acbb