Merge remote-tracking branch 'gh/wip-name-sequencers'

author Sage Weil <sage@newdream.net>

Tue, 3 Apr 2012 05:04:04 +0000 (22:04 -0700)

committer Sage Weil <sage@newdream.net>

Tue, 3 Apr 2012 05:04:04 +0000 (22:04 -0700)
author Sage Weil <sage@newdream.net>
Tue, 3 Apr 2012 05:04:04 +0000 (22:04 -0700)
committer Sage Weil <sage@newdream.net>
Tue, 3 Apr 2012 05:04:04 +0000 (22:04 -0700)
diff --cc src/Makefile.am
Simple merge
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 3 Apr 2012 05:04:04 +0000 (22:04 -0700)
committer	Sage Weil <sage@newdream.net>
	Tue, 3 Apr 2012 05:04:04 +0000 (22:04 -0700)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history