From: Andrew Schoen <andrew.schoen@gmail.com>
Date: Fri, 27 Mar 2015 00:21:18 +0000 (-0700)
Subject: Merge pull request #381 from dmick/master
X-Git-Tag: v10.2.6~165^2^2~519
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=85e7be5a485fec5465333688391ce14ef6051e91;p=ceph.git

Merge pull request #381 from dmick/master

calamari_setup fixes
---

85e7be5a485fec5465333688391ce14ef6051e91