Merge remote-tracking branch 'gh/wip-mds'

author Sage Weil <sage@inktank.com>

Thu, 27 Dec 2012 21:40:01 +0000 (13:40 -0800)

committer Sage Weil <sage@inktank.com>

Thu, 27 Dec 2012 21:40:01 +0000 (13:40 -0800)
author Sage Weil <sage@inktank.com>
Thu, 27 Dec 2012 21:40:01 +0000 (13:40 -0800)
committer Sage Weil <sage@inktank.com>
Thu, 27 Dec 2012 21:40:01 +0000 (13:40 -0800)
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/mds/MDS.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Thu, 27 Dec 2012 21:40:01 +0000 (13:40 -0800)
committer	Sage Weil <sage@inktank.com>
	Thu, 27 Dec 2012 21:40:01 +0000 (13:40 -0800)
		1	2
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history