Merge pull request #8072 from yuyuyu101/wip-async-skip-steps

author Haomai Wang <haomaiwang@gmail.com>

Tue, 3 May 2016 02:21:40 +0000 (10:21 +0800)

committer Haomai Wang <haomaiwang@gmail.com>

Tue, 3 May 2016 02:21:40 +0000 (10:21 +0800)
author Haomai Wang <haomaiwang@gmail.com>
Tue, 3 May 2016 02:21:40 +0000 (10:21 +0800)
committer Haomai Wang <haomaiwang@gmail.com>
Tue, 3 May 2016 02:21:40 +0000 (10:21 +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>
	Tue, 3 May 2016 02:21:40 +0000 (10:21 +0800)
committer	Haomai Wang <haomaiwang@gmail.com>
	Tue, 3 May 2016 02:21:40 +0000 (10:21 +0800)
		1	2
src/msg/async/AsyncConnection.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/async/AsyncConnection.h	patch \|	diff1 \|	diff2 \|	blob \| history