Merge pull request #7380 from yuyuyu101/async-nip

author Sage Weil <sage@redhat.com>

Thu, 4 Feb 2016 13:39:15 +0000 (08:39 -0500)

committer Sage Weil <sage@redhat.com>

Thu, 4 Feb 2016 13:39:15 +0000 (08:39 -0500)
author Sage Weil <sage@redhat.com>
Thu, 4 Feb 2016 13:39:15 +0000 (08:39 -0500)
committer Sage Weil <sage@redhat.com>
Thu, 4 Feb 2016 13:39:15 +0000 (08:39 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/msg/async/AsyncConnection.cc
Simple merge
diff --cc src/msg/async/AsyncMessenger.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 4 Feb 2016 13:39:15 +0000 (08:39 -0500)
committer	Sage Weil <sage@redhat.com>
	Thu, 4 Feb 2016 13:39:15 +0000 (08:39 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/async/AsyncConnection.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/async/AsyncMessenger.h	patch \|	diff1 \|	diff2 \|	blob \| history