Merge pull request #11175 from asheplyakov/wip-rbd-default-features

author Jason Dillaman <dillaman@redhat.com>

Thu, 20 Oct 2016 01:25:41 +0000 (21:25 -0400)

committer GitHub <noreply@github.com>

Thu, 20 Oct 2016 01:25:41 +0000 (21:25 -0400)
author Jason Dillaman <dillaman@redhat.com>
Thu, 20 Oct 2016 01:25:41 +0000 (21:25 -0400)
committer GitHub <noreply@github.com>
Thu, 20 Oct 2016 01:25:41 +0000 (21:25 -0400)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/test/cli/rbd/help.t
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Thu, 20 Oct 2016 01:25:41 +0000 (21:25 -0400)
committer	GitHub <noreply@github.com>
	Thu, 20 Oct 2016 01:25:41 +0000 (21:25 -0400)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/cli/rbd/help.t	patch \|	diff1 \|	diff2 \|	blob \| history