Merge pull request #804 from dang/docker-dev

author Leseb <seb@redhat.com>

Mon, 6 Jun 2016 09:12:43 +0000 (11:12 +0200)

committer Leseb <seb@redhat.com>

Mon, 6 Jun 2016 09:12:43 +0000 (11:12 +0200)
author Leseb <seb@redhat.com>
Mon, 6 Jun 2016 09:12:43 +0000 (11:12 +0200)
committer Leseb <seb@redhat.com>
Mon, 6 Jun 2016 09:12:43 +0000 (11:12 +0200)
diff --cc group_vars/all.docker.sample
Simple merge
diff --cc roles/ceph-mon/tasks/docker/start_docker_monitor.yml
Simple merge
diff --cc roles/ceph-rgw/tasks/docker/main.yml
Simple merge
author	Leseb <seb@redhat.com>
	Mon, 6 Jun 2016 09:12:43 +0000 (11:12 +0200)
committer	Leseb <seb@redhat.com>
	Mon, 6 Jun 2016 09:12:43 +0000 (11:12 +0200)
		1	2
group_vars/all.docker.sample	patch \|	diff1 \|	diff2 \|	blob \| history
roles/ceph-mon/tasks/docker/start_docker_monitor.yml	patch \|	diff1 \|	diff2 \|	blob \| history
roles/ceph-rgw/tasks/docker/main.yml	patch \|	diff1 \|	diff2 \|	blob \| history