Merge pull request #862 from ceph/wip-env

author Igor Canadi <igor.canadi@gmail.com>

Fri, 11 Dec 2015 02:45:07 +0000 (18:45 -0800)

committer Igor Canadi <igor.canadi@gmail.com>

Fri, 11 Dec 2015 02:45:07 +0000 (18:45 -0800)
author Igor Canadi <igor.canadi@gmail.com>
Fri, 11 Dec 2015 02:45:07 +0000 (18:45 -0800)
committer Igor Canadi <igor.canadi@gmail.com>
Fri, 11 Dec 2015 02:45:07 +0000 (18:45 -0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc Makefile
Simple merge
diff --cc src.mk
Simple merge
author	Igor Canadi <igor.canadi@gmail.com>
	Fri, 11 Dec 2015 02:45:07 +0000 (18:45 -0800)
committer	Igor Canadi <igor.canadi@gmail.com>
	Fri, 11 Dec 2015 02:45:07 +0000 (18:45 -0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
src.mk	patch \|	diff1 \|	diff2 \|	blob \| history