Merge pull request #12556 from Adirl/support_roceV2

author Haomai Wang <haomaiwang@gmail.com>

Thu, 22 Dec 2016 04:25:30 +0000 (12:25 +0800)

committer GitHub <noreply@github.com>

Thu, 22 Dec 2016 04:25:30 +0000 (12:25 +0800)
author Haomai Wang <haomaiwang@gmail.com>
Thu, 22 Dec 2016 04:25:30 +0000 (12:25 +0800)
committer GitHub <noreply@github.com>
Thu, 22 Dec 2016 04:25:30 +0000 (12:25 +0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/msg/async/rdma/Infiniband.cc
Simple merge
author	Haomai Wang <haomaiwang@gmail.com>
	Thu, 22 Dec 2016 04:25:30 +0000 (12:25 +0800)
committer	GitHub <noreply@github.com>
	Thu, 22 Dec 2016 04:25:30 +0000 (12:25 +0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/async/rdma/Infiniband.cc	patch \|	diff1 \|	diff2 \|	blob \| history