Merge pull request #1068 from ceph/v2.2

author Sébastien Han <seb@redhat.com>

Wed, 16 Nov 2016 15:33:40 +0000 (16:33 +0100)

committer GitHub <noreply@github.com>

Wed, 16 Nov 2016 15:33:40 +0000 (16:33 +0100)
author Sébastien Han <seb@redhat.com>
Wed, 16 Nov 2016 15:33:40 +0000 (16:33 +0100)
committer GitHub <noreply@github.com>
Wed, 16 Nov 2016 15:33:40 +0000 (16:33 +0100)
diff --cc infrastructure-playbooks/purge-cluster.yml
Simple merge
diff --cc infrastructure-playbooks/rolling_update.yml
Simple merge
diff --cc roles/ceph-osd/tasks/check_devices_auto.yml
Simple merge
author	Sébastien Han <seb@redhat.com>
	Wed, 16 Nov 2016 15:33:40 +0000 (16:33 +0100)
committer	GitHub <noreply@github.com>
	Wed, 16 Nov 2016 15:33:40 +0000 (16:33 +0100)
		1	2
infrastructure-playbooks/purge-cluster.yml	patch \|	diff1 \|	diff2 \|	blob \| history
infrastructure-playbooks/rolling_update.yml	patch \|	diff1 \|	diff2 \|	blob \| history
roles/ceph-osd/tasks/check_devices_auto.yml	patch \|	diff1 \|	diff2 \|	blob \| history