Merge remote branch 'upstream/master' into wip_backfill_merged

author Samuel Just <samuel.just@dreamhost.com>

Wed, 14 Dec 2011 19:40:15 +0000 (11:40 -0800)

committer Samuel Just <samuel.just@dreamhost.com>

Wed, 14 Dec 2011 19:40:15 +0000 (11:40 -0800)
author Samuel Just <samuel.just@dreamhost.com>
Wed, 14 Dec 2011 19:40:15 +0000 (11:40 -0800)
committer Samuel Just <samuel.just@dreamhost.com>
Wed, 14 Dec 2011 19:40:15 +0000 (11:40 -0800)
diff --cc src/Makefile.am
Simple merge
diff --cc src/os/ObjectStore.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Samuel Just <samuel.just@dreamhost.com>
	Wed, 14 Dec 2011 19:40:15 +0000 (11:40 -0800)
committer	Samuel Just <samuel.just@dreamhost.com>
	Wed, 14 Dec 2011 19:40:15 +0000 (11:40 -0800)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/ObjectStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history