Merge pull request #17464 from smithfarm/wip-20964-luminous

author Abhishek L <abhishek.lekshmanan@gmail.com>

Mon, 11 Sep 2017 19:37:26 +0000 (21:37 +0200)

committer GitHub <noreply@github.com>

Mon, 11 Sep 2017 19:37:26 +0000 (21:37 +0200)
author Abhishek L <abhishek.lekshmanan@gmail.com>
Mon, 11 Sep 2017 19:37:26 +0000 (21:37 +0200)
committer GitHub <noreply@github.com>
Mon, 11 Sep 2017 19:37:26 +0000 (21:37 +0200)
diff --cc src/common/options.cc
Simple merge
diff --cc src/librbd/internal.cc
Simple merge
diff --cc src/tools/rbd/Utils.cc
Simple merge
author	Abhishek L <abhishek.lekshmanan@gmail.com>
	Mon, 11 Sep 2017 19:37:26 +0000 (21:37 +0200)
committer	GitHub <noreply@github.com>
	Mon, 11 Sep 2017 19:37:26 +0000 (21:37 +0200)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rbd/Utils.cc	patch \|	diff1 \|	diff2 \|	blob \| history