git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commit

author	leseb <seb@redhat.com>
	Fri, 26 Jun 2015 13:10:50 +0000 (15:10 +0200)
committer	leseb <seb@redhat.com>
	Fri, 26 Jun 2015 13:10:50 +0000 (15:10 +0200)
commit	c3bc5b3e449f3bbe932c929e7062a1f14927b495
tree	0d68fad336425ed0f75625d8b9a4638142fd0e34	tree \| snapshot
parent	7da28ef497918a1ddc77856d2b68b2a0fcdfae01	commit \| diff
parent	5588ada33235d21d915695ccb76f5096067bdd95	commit \| diff

Merge branch 'group_names' of https://github.com/bjne/ceph-ansible into bjne-group_names

Signed-off-by: leseb <seb@redhat.com>
Conflicts:
roles/ceph-common/handlers/main.yml
roles/ceph-mon/tasks/ceph_keys.yml

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

group_vars/all	diff1 \|	diff2 \|	blob \| history
roles/ceph-common/defaults/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-common/handlers/main.yml	diff1 \|	diff2 \|	blob \| history
roles/ceph-common/templates/ceph.conf.j2	diff1 \|	diff2 \|	blob \| history
roles/ceph-mon/defaults/main.yml	diff1 \|	diff2 \|	blob \| history