Merge pull request #18719 from tchaikov/wip-pr-18373-luminous

author Kefu Chai <tchaikov@gmail.com>

Wed, 8 Nov 2017 06:30:42 +0000 (14:30 +0800)

committer GitHub <noreply@github.com>

Wed, 8 Nov 2017 06:30:42 +0000 (14:30 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 8 Nov 2017 06:30:42 +0000 (14:30 +0800)
committer GitHub <noreply@github.com>
Wed, 8 Nov 2017 06:30:42 +0000 (14:30 +0800)
diff --cc qa/tasks/ceph.py
Simple merge
diff --cc qa/tasks/ceph_manager.py
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 8 Nov 2017 06:30:42 +0000 (14:30 +0800)
committer	GitHub <noreply@github.com>
	Wed, 8 Nov 2017 06:30:42 +0000 (14:30 +0800)
		1	2
qa/tasks/ceph.py	patch \|	diff1 \|	diff2 \|	blob \| history
qa/tasks/ceph_manager.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history