Merge pull request #23044 from tchaikov/wip-crimson-connection

author Kefu Chai <tchaikov@gmail.com>

Tue, 17 Jul 2018 15:31:23 +0000 (23:31 +0800)

committer GitHub <noreply@github.com>

Tue, 17 Jul 2018 15:31:23 +0000 (23:31 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 17 Jul 2018 15:31:23 +0000 (23:31 +0800)
committer GitHub <noreply@github.com>
Tue, 17 Jul 2018 15:31:23 +0000 (23:31 +0800)
diff --cc src/crimson/net/Connection.h
Simple merge
diff --cc src/crimson/net/SocketConnection.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Tue, 17 Jul 2018 15:31:23 +0000 (23:31 +0800)
committer	GitHub <noreply@github.com>
	Tue, 17 Jul 2018 15:31:23 +0000 (23:31 +0800)
		1	2
src/crimson/net/Connection.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/crimson/net/SocketConnection.h	patch \|	diff1 \|	diff2 \|	blob \| history