Merge pull request #15544 from taodd/master

author John Spray <jspray@redhat.com>

Mon, 19 Jun 2017 14:53:51 +0000 (10:53 -0400)

committer GitHub <noreply@github.com>

Mon, 19 Jun 2017 14:53:51 +0000 (10:53 -0400)
author John Spray <jspray@redhat.com>
Mon, 19 Jun 2017 14:53:51 +0000 (10:53 -0400)
committer GitHub <noreply@github.com>
Mon, 19 Jun 2017 14:53:51 +0000 (10:53 -0400)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
author	John Spray <jspray@redhat.com>
	Mon, 19 Jun 2017 14:53:51 +0000 (10:53 -0400)
committer	GitHub <noreply@github.com>
	Mon, 19 Jun 2017 14:53:51 +0000 (10:53 -0400)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history