Merge pull request #14610 from jcsp/wip-17980

author John Spray <jspray@redhat.com>

Tue, 23 May 2017 13:57:01 +0000 (14:57 +0100)

committer GitHub <noreply@github.com>

Tue, 23 May 2017 13:57:01 +0000 (14:57 +0100)
author John Spray <jspray@redhat.com>
Tue, 23 May 2017 13:57:01 +0000 (14:57 +0100)
committer GitHub <noreply@github.com>
Tue, 23 May 2017 13:57:01 +0000 (14:57 +0100)
diff --cc src/mds/Server.cc
Simple merge
diff --cc src/mds/Server.h
Simple merge
author	John Spray <jspray@redhat.com>
	Tue, 23 May 2017 13:57:01 +0000 (14:57 +0100)
committer	GitHub <noreply@github.com>
	Tue, 23 May 2017 13:57:01 +0000 (14:57 +0100)
		1	2
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.h	patch \|	diff1 \|	diff2 \|	blob \| history