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

Merge branch 'lkairies-hadoop-append' 

Conflicts:
	contrib/hadoop/src/org/xtreemfs/common/clients/hadoop/XtreemFSFileSystem.java
parents 7a4bdfad 61118cd1
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