Merge pull request #14096 from baiyanchun/remove_useless_parameter

author Sage Weil <sage@newdream.net>

Fri, 24 Mar 2017 21:41:18 +0000 (16:41 -0500)

committer GitHub <noreply@github.com>

Fri, 24 Mar 2017 21:41:18 +0000 (16:41 -0500)
author Sage Weil <sage@newdream.net>
Fri, 24 Mar 2017 21:41:18 +0000 (16:41 -0500)
committer GitHub <noreply@github.com>
Fri, 24 Mar 2017 21:41:18 +0000 (16:41 -0500)
diff --cc src/common/ceph_argparse.cc
Simple merge
diff --cc src/global/global_init.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 24 Mar 2017 21:41:18 +0000 (16:41 -0500)
committer	GitHub <noreply@github.com>
	Fri, 24 Mar 2017 21:41:18 +0000 (16:41 -0500)
		1	2
src/common/ceph_argparse.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/global/global_init.cc	patch \|	diff1 \|	diff2 \|	blob \| history