Merge pull request #21139 from guzhongyan/cmd-wildcard

author John Spray <jspray@redhat.com>

Tue, 24 Apr 2018 10:19:32 +0000 (11:19 +0100)

committer GitHub <noreply@github.com>

Tue, 24 Apr 2018 10:19:32 +0000 (11:19 +0100)
author John Spray <jspray@redhat.com>
Tue, 24 Apr 2018 10:19:32 +0000 (11:19 +0100)
committer GitHub <noreply@github.com>
Tue, 24 Apr 2018 10:19:32 +0000 (11:19 +0100)
diff --cc src/mgr/MgrCommands.h
Simple merge
diff --cc src/mon/MonCommands.h
Simple merge
author	John Spray <jspray@redhat.com>
	Tue, 24 Apr 2018 10:19:32 +0000 (11:19 +0100)
committer	GitHub <noreply@github.com>
	Tue, 24 Apr 2018 10:19:32 +0000 (11:19 +0100)
		1	2
src/mgr/MgrCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history