Merge pull request #856 from dang/ceph-nfs

author Leseb <seb@redhat.com>

Tue, 5 Jul 2016 15:33:39 +0000 (17:33 +0200)

committer GitHub <noreply@github.com>

Tue, 5 Jul 2016 15:33:39 +0000 (17:33 +0200)
author Leseb <seb@redhat.com>
Tue, 5 Jul 2016 15:33:39 +0000 (17:33 +0200)
committer GitHub <noreply@github.com>
Tue, 5 Jul 2016 15:33:39 +0000 (17:33 +0200)
diff --cc Vagrantfile
Simple merge
diff --cc vagrant_variables.yml.sample
Simple merge
author	Leseb <seb@redhat.com>
	Tue, 5 Jul 2016 15:33:39 +0000 (17:33 +0200)
committer	GitHub <noreply@github.com>
	Tue, 5 Jul 2016 15:33:39 +0000 (17:33 +0200)
		1	2
Vagrantfile	patch \|	diff1 \|	diff2 \|	blob \| history
vagrant_variables.yml.sample	patch \|	diff1 \|	diff2 \|	blob \| history