Merge pull request #16875 from dillaman/wip-lirbd-group-luminous

author Jason Dillaman <dillaman@redhat.com>

Tue, 8 Aug 2017 16:57:24 +0000 (12:57 -0400)

committer GitHub <noreply@github.com>

Tue, 8 Aug 2017 16:57:24 +0000 (12:57 -0400)
author Jason Dillaman <dillaman@redhat.com>
Tue, 8 Aug 2017 16:57:24 +0000 (12:57 -0400)
committer GitHub <noreply@github.com>
Tue, 8 Aug 2017 16:57:24 +0000 (12:57 -0400)
diff --cc src/test/cli/rbd/help.t
Simple merge
diff --cc src/tools/rbd/CMakeLists.txt
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Tue, 8 Aug 2017 16:57:24 +0000 (12:57 -0400)
committer	GitHub <noreply@github.com>
	Tue, 8 Aug 2017 16:57:24 +0000 (12:57 -0400)
		1	2
src/test/cli/rbd/help.t	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rbd/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history