Merge pull request #15259 from zealoussnow/wip-0524

author Yuri Weinstein <yuri.weinstein@gmail.com>

Tue, 30 May 2017 15:44:47 +0000 (08:44 -0700)

committer GitHub <noreply@github.com>

Tue, 30 May 2017 15:44:47 +0000 (08:44 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Tue, 30 May 2017 15:44:47 +0000 (08:44 -0700)
committer GitHub <noreply@github.com>
Tue, 30 May 2017 15:44:47 +0000 (08:44 -0700)
diff --cc ceph.spec.in
Simple merge
diff --cc src/CMakeLists.txt
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Tue, 30 May 2017 15:44:47 +0000 (08:44 -0700)
committer	GitHub <noreply@github.com>
	Tue, 30 May 2017 15:44:47 +0000 (08:44 -0700)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history