From: Alfredo Deza <alfredo@deza.pe>
Date: Wed, 14 Sep 2016 11:57:29 +0000 (+0530)
Subject: Merge pull request #480 from ceph/wip-calamari
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2cb4f4069c7a0fac1abecd76e6014272f22cf139;p=ceph-build.git

Merge pull request #480 from ceph/wip-calamari

calamari: Various fixes
---

2cb4f4069c7a0fac1abecd76e6014272f22cf139