]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Rebasing with upstream
authorJames Saint-Rossy <james_saintrossy@cable.comcast.com>
Wed, 31 Aug 2016 21:13:09 +0000 (17:13 -0400)
committerJames Saint-Rossy <james_saintrossy@cable.comcast.com>
Wed, 31 Aug 2016 21:13:09 +0000 (17:13 -0400)
1  2 
README.md
group_vars/all.sample
roles/ceph-common/defaults/main.yml

diff --cc README.md
Simple merge
Simple merge
Simple merge