Merge pull request #9853 from dx9/wip-alpine-dev-support

author Sage Weil <sage@newdream.net>

Fri, 21 Apr 2017 23:54:25 +0000 (18:54 -0500)

committer GitHub <noreply@github.com>

Fri, 21 Apr 2017 23:54:25 +0000 (18:54 -0500)
author Sage Weil <sage@newdream.net>
Fri, 21 Apr 2017 23:54:25 +0000 (18:54 -0500)
committer GitHub <noreply@github.com>
Fri, 21 Apr 2017 23:54:25 +0000 (18:54 -0500)
diff --cc .gitignore
Simple merge
diff --cc install-deps.sh
Simple merge
diff --cc run-make-check.sh
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 21 Apr 2017 23:54:25 +0000 (18:54 -0500)
committer	GitHub <noreply@github.com>
	Fri, 21 Apr 2017 23:54:25 +0000 (18:54 -0500)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
install-deps.sh	patch \|	diff1 \|	diff2 \|	blob \| history
run-make-check.sh	patch \|	diff1 \|	diff2 \|	blob \| history