Merge pull request #386 from ceph/wip-osd-xattr

author Sage Weil <sage@inktank.com>

Tue, 2 Jul 2013 18:32:23 +0000 (11:32 -0700)

committer Sage Weil <sage@inktank.com>

Tue, 2 Jul 2013 18:32:23 +0000 (11:32 -0700)
author Sage Weil <sage@inktank.com>
Tue, 2 Jul 2013 18:32:23 +0000 (11:32 -0700)
committer Sage Weil <sage@inktank.com>
Tue, 2 Jul 2013 18:32:23 +0000 (11:32 -0700)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/test/librados/misc.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Tue, 2 Jul 2013 18:32:23 +0000 (11:32 -0700)
committer	Sage Weil <sage@inktank.com>
	Tue, 2 Jul 2013 18:32:23 +0000 (11:32 -0700)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librados/misc.cc	patch \|	diff1 \|	diff2 \|	blob \| history