Merge pull request #18544 from ddiss/pid_max

author Kefu Chai <tchaikov@gmail.com>

Mon, 20 Nov 2017 06:37:08 +0000 (14:37 +0800)

committer GitHub <noreply@github.com>

Mon, 20 Nov 2017 06:37:08 +0000 (14:37 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 20 Nov 2017 06:37:08 +0000 (14:37 +0800)
committer GitHub <noreply@github.com>
Mon, 20 Nov 2017 06:37:08 +0000 (14:37 +0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc ceph.spec.in
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 20 Nov 2017 06:37:08 +0000 (14:37 +0800)
committer	GitHub <noreply@github.com>
	Mon, 20 Nov 2017 06:37:08 +0000 (14:37 +0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history