Merge pull request #3365 from liewegas/wip-peering

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

Thu, 22 Jan 2015 19:09:36 +0000 (11:09 -0800)

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

Thu, 22 Jan 2015 19:09:36 +0000 (11:09 -0800)
author Samuel Just <sam.just@inktank.com>
Thu, 22 Jan 2015 19:09:36 +0000 (11:09 -0800)
committer Samuel Just <sam.just@inktank.com>
Thu, 22 Jan 2015 19:09:36 +0000 (11:09 -0800)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Thu, 22 Jan 2015 19:09:36 +0000 (11:09 -0800)
committer	Samuel Just <sam.just@inktank.com>
	Thu, 22 Jan 2015 19:09:36 +0000 (11:09 -0800)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history