Merge pull request #343 from dalgaaf/wip-da-SCA-cppcheck

author Sage Weil <sage@inktank.com>

Sat, 8 Jun 2013 00:12:10 +0000 (17:12 -0700)

committer Sage Weil <sage@inktank.com>

Sat, 8 Jun 2013 00:12:10 +0000 (17:12 -0700)
author Sage Weil <sage@inktank.com>
Sat, 8 Jun 2013 00:12:10 +0000 (17:12 -0700)
committer Sage Weil <sage@inktank.com>
Sat, 8 Jun 2013 00:12:10 +0000 (17:12 -0700)
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Sat, 8 Jun 2013 00:12:10 +0000 (17:12 -0700)
committer	Sage Weil <sage@inktank.com>
	Sat, 8 Jun 2013 00:12:10 +0000 (17:12 -0700)
		1	2
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history