Merge pull request #265 from ceph/wip-nagios-common

author Zack Cerza <zack@cerza.org>

Wed, 20 Jul 2016 15:24:22 +0000 (09:24 -0600)

committer GitHub <noreply@github.com>

Wed, 20 Jul 2016 15:24:22 +0000 (09:24 -0600)
author Zack Cerza <zack@cerza.org>
Wed, 20 Jul 2016 15:24:22 +0000 (09:24 -0600)
committer GitHub <noreply@github.com>
Wed, 20 Jul 2016 15:24:22 +0000 (09:24 -0600)
diff --cc roles/testnode/vars/centos_6.yml
Simple merge
diff --cc roles/testnode/vars/centos_7.yml
Simple merge
diff --cc roles/testnode/vars/redhat_6.yml
Simple merge
diff --cc roles/testnode/vars/redhat_7.yml
Simple merge
author	Zack Cerza <zack@cerza.org>
	Wed, 20 Jul 2016 15:24:22 +0000 (09:24 -0600)
committer	GitHub <noreply@github.com>
	Wed, 20 Jul 2016 15:24:22 +0000 (09:24 -0600)
		1	2
roles/testnode/vars/centos_6.yml	patch \|	diff1 \|	diff2 \|	blob \| history
roles/testnode/vars/centos_7.yml	patch \|	diff1 \|	diff2 \|	blob \| history
roles/testnode/vars/redhat_6.yml	patch \|	diff1 \|	diff2 \|	blob \| history
roles/testnode/vars/redhat_7.yml	patch \|	diff1 \|	diff2 \|	blob \| history