Merge remote-tracking branch 'origin/wip-7999' into firefly-next

author Samuel Just <sam.just@inktank.com>

Sat, 2 Aug 2014 18:22:47 +0000 (11:22 -0700)

committer Samuel Just <sam.just@inktank.com>

Sat, 2 Aug 2014 18:22:47 +0000 (11:22 -0700)
author Samuel Just <sam.just@inktank.com>
Sat, 2 Aug 2014 18:22:47 +0000 (11:22 -0700)
committer Samuel Just <sam.just@inktank.com>
Sat, 2 Aug 2014 18:22:47 +0000 (11:22 -0700)
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/os/KeyValueStore.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Sat, 2 Aug 2014 18:22:47 +0000 (11:22 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Sat, 2 Aug 2014 18:22:47 +0000 (11:22 -0700)
		1	2
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/KeyValueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history