Merge pull request #12198 from tchaikov/wip-pybind-freebsd

author Kefu Chai <tchaikov@gmail.com>

Tue, 27 Dec 2016 12:52:07 +0000 (20:52 +0800)

committer GitHub <noreply@github.com>

Tue, 27 Dec 2016 12:52:07 +0000 (20:52 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 27 Dec 2016 12:52:07 +0000 (20:52 +0800)
committer GitHub <noreply@github.com>
Tue, 27 Dec 2016 12:52:07 +0000 (20:52 +0800)
diff --cc src/pybind/cephfs/cephfs.pyx
Simple merge
diff --cc src/pybind/rados/rados.pyx
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Tue, 27 Dec 2016 12:52:07 +0000 (20:52 +0800)
committer	GitHub <noreply@github.com>
	Tue, 27 Dec 2016 12:52:07 +0000 (20:52 +0800)
		1	2
src/pybind/cephfs/cephfs.pyx	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/rados/rados.pyx	patch \|	diff1 \|	diff2 \|	blob \| history