From: Warren Usui <warren.usui@inktank.com>
Date: Sat, 7 Feb 2015 01:40:21 +0000 (-0800)
Subject: Merge pull request #324 from dmick/master
X-Git-Tag: v11.1.1~58^2^2~712
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=92d39b50f3a437e0cf7a3a1bcecb92e1082dea8d;p=ceph.git

Merge pull request #324 from dmick/master

tasks/calamari_setup: ice_setup 0.2.0 has added another prompt
---

92d39b50f3a437e0cf7a3a1bcecb92e1082dea8d