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

Merge branch 'master' into lkairies-osd-smart-status 

Conflicts:
	doc/xtreemfs-userguide/xtfs-guide.pdf
parents 3fd91827 c34a3257
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