Merge pull request #11684 from runsisi/wip-fix-asok-mode

author Sage Weil <sage@newdream.net>

Fri, 21 Apr 2017 17:23:05 +0000 (12:23 -0500)

committer GitHub <noreply@github.com>

Fri, 21 Apr 2017 17:23:05 +0000 (12:23 -0500)
author Sage Weil <sage@newdream.net>
Fri, 21 Apr 2017 17:23:05 +0000 (12:23 -0500)
committer GitHub <noreply@github.com>
Fri, 21 Apr 2017 17:23:05 +0000 (12:23 -0500)
diff --cc src/common/admin_socket.cc
Simple merge
diff --cc src/common/admin_socket.h
Simple merge
diff --cc src/common/config_opts.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 21 Apr 2017 17:23:05 +0000 (12:23 -0500)
committer	GitHub <noreply@github.com>
	Fri, 21 Apr 2017 17:23:05 +0000 (12:23 -0500)
		1	2
src/common/admin_socket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/admin_socket.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history