]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #324 from dmick/master
authorWarren Usui <warren.usui@inktank.com>
Sat, 7 Feb 2015 01:40:21 +0000 (17:40 -0800)
committerWarren Usui <warren.usui@inktank.com>
Sat, 7 Feb 2015 01:40:21 +0000 (17:40 -0800)
tasks/calamari_setup: ice_setup 0.2.0 has added another prompt


Trivial merge