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

Merge branch 'lkairies-hadoop2_integration' 

Conflicts:
	contrib/hadoop/src/org/xtreemfs/common/clients/hadoop/XtreemFSFileSystem.java
	doc/xtreemfs-userguide/xtfs-guide.pdf
	doc/xtreemfs-userguide/xtfs-guide.tex
parents 6d479b3d 5bc04dd4
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