Merge pull request #15495 from wjwithagen/wip-wjw-freebsd-host-errno

author Sage Weil <sage@newdream.net>

Fri, 16 Jun 2017 21:14:19 +0000 (16:14 -0500)

committer GitHub <noreply@github.com>

Fri, 16 Jun 2017 21:14:19 +0000 (16:14 -0500)
author Sage Weil <sage@newdream.net>
Fri, 16 Jun 2017 21:14:19 +0000 (16:14 -0500)
committer GitHub <noreply@github.com>
Fri, 16 Jun 2017 21:14:19 +0000 (16:14 -0500)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/osdc/Objecter.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 16 Jun 2017 21:14:19 +0000 (16:14 -0500)
committer	GitHub <noreply@github.com>
	Fri, 16 Jun 2017 21:14:19 +0000 (16:14 -0500)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history