Skip to content
Commit 73f76e6f authored by Lukas Kairies's avatar Lukas Kairies
Browse files

Merge branch 'lkairies-hadoop-ssl-support' 

Conflicts:
	doc/xtreemfs-userguide/xtfs-guide.pdf
	doc/xtreemfs-userguide/xtfs-guide.tex
	tests/test_config.py
parents 62403ccf c9cbf98c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment