Merge pull request #16106 from smithfarm/wip-19680-kraken

author Nathan Cutler <presnypreklad@gmail.com>

Wed, 19 Jul 2017 21:01:01 +0000 (23:01 +0200)

committer GitHub <noreply@github.com>

Wed, 19 Jul 2017 21:01:01 +0000 (23:01 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Wed, 19 Jul 2017 21:01:01 +0000 (23:01 +0200)
committer GitHub <noreply@github.com>
Wed, 19 Jul 2017 21:01:01 +0000 (23:01 +0200)
diff --cc src/mds/CDir.cc
Simple merge
diff --cc src/mds/MDCache.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Wed, 19 Jul 2017 21:01:01 +0000 (23:01 +0200)
committer	GitHub <noreply@github.com>
	Wed, 19 Jul 2017 21:01:01 +0000 (23:01 +0200)
		1	2
src/mds/CDir.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history