Merge pull request #27914 from dzafman/wip-39304

author David Zafman <dzafman@redhat.com>

Sat, 11 May 2019 00:41:31 +0000 (17:41 -0700)

committer GitHub <noreply@github.com>

Sat, 11 May 2019 00:41:31 +0000 (17:41 -0700)
author David Zafman <dzafman@redhat.com>
Sat, 11 May 2019 00:41:31 +0000 (17:41 -0700)
committer GitHub <noreply@github.com>
Sat, 11 May 2019 00:41:31 +0000 (17:41 -0700)
diff --cc src/osd/PeeringState.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	David Zafman <dzafman@redhat.com>
	Sat, 11 May 2019 00:41:31 +0000 (17:41 -0700)
committer	GitHub <noreply@github.com>
	Sat, 11 May 2019 00:41:31 +0000 (17:41 -0700)
		1	2
src/osd/PeeringState.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