Merge pull request #14317 from ukernel/wip-19306

author John Spray <jspray@redhat.com>

Mon, 24 Apr 2017 21:11:08 +0000 (22:11 +0100)

committer GitHub <noreply@github.com>

Mon, 24 Apr 2017 21:11:08 +0000 (22:11 +0100)
author John Spray <jspray@redhat.com>
Mon, 24 Apr 2017 21:11:08 +0000 (22:11 +0100)
committer GitHub <noreply@github.com>
Mon, 24 Apr 2017 21:11:08 +0000 (22:11 +0100)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
author	John Spray <jspray@redhat.com>
	Mon, 24 Apr 2017 21:11:08 +0000 (22:11 +0100)
committer	GitHub <noreply@github.com>
	Mon, 24 Apr 2017 21:11:08 +0000 (22:11 +0100)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history