Merge pull request #1788 from ceph/wip-da-sca-20140507

author Sage Weil <sage@inktank.com>

Thu, 8 May 2014 15:47:05 +0000 (08:47 -0700)

committer Sage Weil <sage@inktank.com>

Thu, 8 May 2014 15:47:05 +0000 (08:47 -0700)
author Sage Weil <sage@inktank.com>
Thu, 8 May 2014 15:47:05 +0000 (08:47 -0700)
committer Sage Weil <sage@inktank.com>
Thu, 8 May 2014 15:47:05 +0000 (08:47 -0700)
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Thu, 8 May 2014 15:47:05 +0000 (08:47 -0700)
committer	Sage Weil <sage@inktank.com>
	Thu, 8 May 2014 15:47:05 +0000 (08:47 -0700)
		1	2
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history