Merge pull request #13785 from liewegas/wip-cleanup-features

author Sage Weil <sage@newdream.net>

Wed, 8 Mar 2017 17:14:08 +0000 (11:14 -0600)

committer GitHub <noreply@github.com>

Wed, 8 Mar 2017 17:14:08 +0000 (11:14 -0600)
author Sage Weil <sage@newdream.net>
Wed, 8 Mar 2017 17:14:08 +0000 (11:14 -0600)
committer GitHub <noreply@github.com>
Wed, 8 Mar 2017 17:14:08 +0000 (11:14 -0600)
diff --cc src/ceph_fuse.cc
Simple merge
diff --cc src/test/msgr/perf_msgr_server.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 8 Mar 2017 17:14:08 +0000 (11:14 -0600)
committer	GitHub <noreply@github.com>
	Wed, 8 Mar 2017 17:14:08 +0000 (11:14 -0600)
		1	2
src/ceph_fuse.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/msgr/perf_msgr_server.cc	patch \|	diff1 \|	diff2 \|	blob \| history