Merge pull request #11078 from ukernel/wip-17271

author John Spray <jspray@redhat.com>

Wed, 28 Sep 2016 11:12:41 +0000 (12:12 +0100)

committer GitHub <noreply@github.com>

Wed, 28 Sep 2016 11:12:41 +0000 (12:12 +0100)
author John Spray <jspray@redhat.com>
Wed, 28 Sep 2016 11:12:41 +0000 (12:12 +0100)
committer GitHub <noreply@github.com>
Wed, 28 Sep 2016 11:12:41 +0000 (12:12 +0100)
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
author	John Spray <jspray@redhat.com>
	Wed, 28 Sep 2016 11:12:41 +0000 (12:12 +0100)
committer	GitHub <noreply@github.com>
	Wed, 28 Sep 2016 11:12:41 +0000 (12:12 +0100)
		1	2
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history