Merge pull request #23955 from wjwithagen/wjw-fix-ceph-helpers.sh

author Kefu Chai <tchaikov@gmail.com>

Mon, 17 Sep 2018 07:44:06 +0000 (15:44 +0800)

committer GitHub <noreply@github.com>

Mon, 17 Sep 2018 07:44:06 +0000 (15:44 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 17 Sep 2018 07:44:06 +0000 (15:44 +0800)
committer GitHub <noreply@github.com>
Mon, 17 Sep 2018 07:44:06 +0000 (15:44 +0800)
diff --cc install-deps.sh
Simple merge
diff --cc qa/standalone/ceph-helpers.sh
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 17 Sep 2018 07:44:06 +0000 (15:44 +0800)
committer	GitHub <noreply@github.com>
	Mon, 17 Sep 2018 07:44:06 +0000 (15:44 +0800)
		1	2
install-deps.sh	patch \|	diff1 \|	diff2 \|	blob \| history
qa/standalone/ceph-helpers.sh	patch \|	diff1 \|	diff2 \|	blob \| history