]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Merge branch 'master' of https://github.com/ceph/ceph-ansible
authorSébastien Han <sebastien.han@enovance.com>
Wed, 29 Apr 2015 09:15:14 +0000 (11:15 +0200)
committerSébastien Han <sebastien.han@enovance.com>
Wed, 29 Apr 2015 09:15:14 +0000 (11:15 +0200)
Conflicts:
rolling_update.yml


Trivial merge