Merge pull request #35906 from gregsfortytwo/wip-stretch-mode

author Neha Ojha <nojha@redhat.com>

Fri, 18 Sep 2020 21:31:45 +0000 (14:31 -0700)

committer GitHub <noreply@github.com>

Fri, 18 Sep 2020 21:31:45 +0000 (14:31 -0700)
author Neha Ojha <nojha@redhat.com>
Fri, 18 Sep 2020 21:31:45 +0000 (14:31 -0700)
committer GitHub <noreply@github.com>
Fri, 18 Sep 2020 21:31:45 +0000 (14:31 -0700)
diff --cc src/osd/PeeringState.cc
Simple merge
diff --cc src/osd/PeeringState.h
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Neha Ojha <nojha@redhat.com>
	Fri, 18 Sep 2020 21:31:45 +0000 (14:31 -0700)
committer	GitHub <noreply@github.com>
	Fri, 18 Sep 2020 21:31:45 +0000 (14:31 -0700)
		1	2
src/osd/PeeringState.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PeeringState.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history