Merge pull request #9784 from ceph/wip-ms-async-fixes

author Haomai Wang <haomaiwang@gmail.com>

Wed, 13 Jul 2016 13:28:53 +0000 (21:28 +0800)

committer GitHub <noreply@github.com>

Wed, 13 Jul 2016 13:28:53 +0000 (21:28 +0800)
author Haomai Wang <haomaiwang@gmail.com>
Wed, 13 Jul 2016 13:28:53 +0000 (21:28 +0800)
committer GitHub <noreply@github.com>
Wed, 13 Jul 2016 13:28:53 +0000 (21:28 +0800)
diff --cc src/msg/async/AsyncConnection.cc
Simple merge
diff --cc src/msg/async/AsyncConnection.h
Simple merge
author	Haomai Wang <haomaiwang@gmail.com>
	Wed, 13 Jul 2016 13:28:53 +0000 (21:28 +0800)
committer	GitHub <noreply@github.com>
	Wed, 13 Jul 2016 13:28:53 +0000 (21:28 +0800)
		1	2
src/msg/async/AsyncConnection.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/async/AsyncConnection.h	patch \|	diff1 \|	diff2 \|	blob \| history