Merge pull request #14684 from smithfarm/wip-19673-jewel

author John Spray <jspray@redhat.com>

Wed, 14 Jun 2017 13:30:53 +0000 (09:30 -0400)

committer GitHub <noreply@github.com>

Wed, 14 Jun 2017 13:30:53 +0000 (09:30 -0400)
author John Spray <jspray@redhat.com>
Wed, 14 Jun 2017 13:30:53 +0000 (09:30 -0400)
committer GitHub <noreply@github.com>
Wed, 14 Jun 2017 13:30:53 +0000 (09:30 -0400)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mds/Server.cc
Simple merge
author	John Spray <jspray@redhat.com>
	Wed, 14 Jun 2017 13:30:53 +0000 (09:30 -0400)
committer	GitHub <noreply@github.com>
	Wed, 14 Jun 2017 13:30:53 +0000 (09:30 -0400)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history