Skip to content
Commit 12343423 authored by Johannes Dillmann's avatar Johannes Dillmann
Browse files

Merge branch 'versioned_xloc' into versioned_xloc_client 

Conflicts:
	cpp/src/libxtreemfs/file_handle_implementation.cpp
parents de37315c 6f051750
Expand all 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