Merge pull request #14572 from smithfarm/wip-19335-kraken

author Nathan Cutler <presnypreklad@gmail.com>

Thu, 20 Apr 2017 17:04:34 +0000 (19:04 +0200)

committer GitHub <noreply@github.com>

Thu, 20 Apr 2017 17:04:34 +0000 (19:04 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Thu, 20 Apr 2017 17:04:34 +0000 (19:04 +0200)
committer GitHub <noreply@github.com>
Thu, 20 Apr 2017 17:04:34 +0000 (19:04 +0200)
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/mds/MDSRank.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Thu, 20 Apr 2017 17:04:34 +0000 (19:04 +0200)
committer	GitHub <noreply@github.com>
	Thu, 20 Apr 2017 17:04:34 +0000 (19:04 +0200)
		1	2
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSRank.cc	patch \|	diff1 \|	diff2 \|	blob \| history