Merge pull request #2297 from ceph/wip-9173

author John Spray <john.spray@inktank.com>

Thu, 28 Aug 2014 16:20:20 +0000 (17:20 +0100)

committer John Spray <john.spray@inktank.com>

Thu, 28 Aug 2014 16:20:20 +0000 (17:20 +0100)
author John Spray <john.spray@inktank.com>
Thu, 28 Aug 2014 16:20:20 +0000 (17:20 +0100)
committer John Spray <john.spray@inktank.com>
Thu, 28 Aug 2014 16:20:20 +0000 (17:20 +0100)
diff --cc src/mds/Server.cc
Simple merge
diff --cc src/mds/SessionMap.cc
Simple merge
diff --cc src/mds/SessionMap.h
Simple merge
author	John Spray <john.spray@inktank.com>
	Thu, 28 Aug 2014 16:20:20 +0000 (17:20 +0100)
committer	John Spray <john.spray@inktank.com>
	Thu, 28 Aug 2014 16:20:20 +0000 (17:20 +0100)
		1	2
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/SessionMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/SessionMap.h	patch \|	diff1 \|	diff2 \|	blob \| history