Merge pull request #415 from ceph/rgw-next

author Sage Weil <sage@inktank.com>

Tue, 9 Jul 2013 22:34:05 +0000 (15:34 -0700)

committer Sage Weil <sage@inktank.com>

Tue, 9 Jul 2013 22:34:05 +0000 (15:34 -0700)
author Sage Weil <sage@inktank.com>
Tue, 9 Jul 2013 22:34:05 +0000 (15:34 -0700)
committer Sage Weil <sage@inktank.com>
Tue, 9 Jul 2013 22:34:05 +0000 (15:34 -0700)
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Tue, 9 Jul 2013 22:34:05 +0000 (15:34 -0700)
committer	Sage Weil <sage@inktank.com>
	Tue, 9 Jul 2013 22:34:05 +0000 (15:34 -0700)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history