Merge pull request #9833 from onyb/wip-rados-pypi

author Josh Durgin <jdurgin@redhat.com>

Wed, 6 Jul 2016 23:01:50 +0000 (16:01 -0700)

committer GitHub <noreply@github.com>

Wed, 6 Jul 2016 23:01:50 +0000 (16:01 -0700)
author Josh Durgin <jdurgin@redhat.com>
Wed, 6 Jul 2016 23:01:50 +0000 (16:01 -0700)
committer GitHub <noreply@github.com>
Wed, 6 Jul 2016 23:01:50 +0000 (16:01 -0700)
diff --cc cmake/modules/Distutils.cmake
Simple merge
diff --cc configure.ac
Simple merge
author	Josh Durgin <jdurgin@redhat.com>
	Wed, 6 Jul 2016 23:01:50 +0000 (16:01 -0700)
committer	GitHub <noreply@github.com>
	Wed, 6 Jul 2016 23:01:50 +0000 (16:01 -0700)
		1	2
cmake/modules/Distutils.cmake	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history