Merge pull request #1208 from dachary/emperor

author Sage Weil <sage@inktank.com>

Tue, 11 Feb 2014 16:31:46 +0000 (08:31 -0800)

committer Sage Weil <sage@inktank.com>

Tue, 11 Feb 2014 16:31:46 +0000 (08:31 -0800)
author Sage Weil <sage@inktank.com>
Tue, 11 Feb 2014 16:31:46 +0000 (08:31 -0800)
committer Sage Weil <sage@inktank.com>
Tue, 11 Feb 2014 16:31:46 +0000 (08:31 -0800)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osdc/Objecter.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Tue, 11 Feb 2014 16:31:46 +0000 (08:31 -0800)
committer	Sage Weil <sage@inktank.com>
	Tue, 11 Feb 2014 16:31:46 +0000 (08:31 -0800)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history