Merge pull request #3211 from yuyuyu101/wip-10172

author Sage Weil <sage@redhat.com>

Mon, 19 Jan 2015 20:38:01 +0000 (12:38 -0800)

committer Sage Weil <sage@redhat.com>

Mon, 19 Jan 2015 20:38:01 +0000 (12:38 -0800)
author Sage Weil <sage@redhat.com>
Mon, 19 Jan 2015 20:38:01 +0000 (12:38 -0800)
committer Sage Weil <sage@redhat.com>
Mon, 19 Jan 2015 20:38:01 +0000 (12:38 -0800)
diff --cc configure.ac
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/msg/async/AsyncConnection.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 19 Jan 2015 20:38:01 +0000 (12:38 -0800)
committer	Sage Weil <sage@redhat.com>
	Mon, 19 Jan 2015 20:38:01 +0000 (12:38 -0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/async/AsyncConnection.cc	patch \|	diff1 \|	diff2 \|	blob \| history