]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #381 from dmick/master
authorAndrew Schoen <andrew.schoen@gmail.com>
Fri, 27 Mar 2015 00:21:18 +0000 (17:21 -0700)
committerAndrew Schoen <andrew.schoen@gmail.com>
Fri, 27 Mar 2015 00:21:18 +0000 (17:21 -0700)
calamari_setup fixes


Trivial merge