Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@inktank.com>

Sun, 2 Jun 2013 21:48:04 +0000 (14:48 -0700)

committer Sage Weil <sage@inktank.com>

Sun, 2 Jun 2013 21:48:04 +0000 (14:48 -0700)
author Sage Weil <sage@inktank.com>
Sun, 2 Jun 2013 21:48:04 +0000 (14:48 -0700)
committer Sage Weil <sage@inktank.com>
Sun, 2 Jun 2013 21:48:04 +0000 (14:48 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/vstart.sh
Simple merge
author	Sage Weil <sage@inktank.com>
	Sun, 2 Jun 2013 21:48:04 +0000 (14:48 -0700)
committer	Sage Weil <sage@inktank.com>
	Sun, 2 Jun 2013 21:48:04 +0000 (14:48 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	patch \|	diff1 \|	diff2 \|	blob \| history