Merge pull request #9560 from Abhishekvrshny/wip-16135-jewel

author Loic Dachary <loic@dachary.org>

Fri, 5 Aug 2016 13:29:23 +0000 (15:29 +0200)

committer GitHub <noreply@github.com>

Fri, 5 Aug 2016 13:29:23 +0000 (15:29 +0200)
author Loic Dachary <loic@dachary.org>
Fri, 5 Aug 2016 13:29:23 +0000 (15:29 +0200)
committer GitHub <noreply@github.com>
Fri, 5 Aug 2016 13:29:23 +0000 (15:29 +0200)
diff --cc src/mds/MDSRank.cc
Simple merge
diff --cc src/mds/mdstypes.cc
Simple merge
diff --cc src/mds/mdstypes.h
Simple merge
author	Loic Dachary <loic@dachary.org>
	Fri, 5 Aug 2016 13:29:23 +0000 (15:29 +0200)
committer	GitHub <noreply@github.com>
	Fri, 5 Aug 2016 13:29:23 +0000 (15:29 +0200)
		1	2
src/mds/MDSRank.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/mdstypes.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/mdstypes.h	patch \|	diff1 \|	diff2 \|	blob \| history