Merge pull request #113 from dalgaaf/wip-da-performance-3

author Sage Weil <sage@newdream.net>

Mon, 18 Mar 2013 20:53:16 +0000 (13:53 -0700)

committer Sage Weil <sage@newdream.net>

Mon, 18 Mar 2013 20:53:16 +0000 (13:53 -0700)
author Sage Weil <sage@newdream.net>
Mon, 18 Mar 2013 20:53:16 +0000 (13:53 -0700)
committer Sage Weil <sage@newdream.net>
Mon, 18 Mar 2013 20:53:16 +0000 (13:53 -0700)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 18 Mar 2013 20:53:16 +0000 (13:53 -0700)
committer	Sage Weil <sage@newdream.net>
	Mon, 18 Mar 2013 20:53:16 +0000 (13:53 -0700)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history