From: Andrew Schoen <andrew.schoen@gmail.com>
Date: Thu, 15 Jan 2015 22:01:30 +0000 (-0600)
Subject: Merge pull request #288 from dmick/master
X-Git-Tag: v0.94.10~27^2^2~199
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b1d9f602c412078c56b843f904be8112f2bc343e;p=ceph.git

Merge pull request #288 from dmick/master

Tweaks to calamari-setup
---

b1d9f602c412078c56b843f904be8112f2bc343e