Merge pull request #8539 from vuhuong/wip-xio-heavy-msgrs

author Casey Bodley <cbodley@users.noreply.github.com>

Thu, 21 Apr 2016 18:57:59 +0000 (14:57 -0400)

committer Casey Bodley <cbodley@users.noreply.github.com>

Thu, 21 Apr 2016 18:57:59 +0000 (14:57 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Thu, 21 Apr 2016 18:57:59 +0000 (14:57 -0400)
committer Casey Bodley <cbodley@users.noreply.github.com>
Thu, 21 Apr 2016 18:57:59 +0000 (14:57 -0400)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/msg/xio/XioConnection.cc
Simple merge
diff --cc src/msg/xio/XioMessenger.cc
Simple merge
diff --cc src/msg/xio/XioPortal.h
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Thu, 21 Apr 2016 18:57:59 +0000 (14:57 -0400)
committer	Casey Bodley <cbodley@users.noreply.github.com>
	Thu, 21 Apr 2016 18:57:59 +0000 (14:57 -0400)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/xio/XioConnection.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/xio/XioMessenger.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/xio/XioPortal.h	patch \|	diff1 \|	diff2 \|	blob \| history