Skip to content
Commit 5410a937 authored by Christoph Kleineweber's avatar Christoph Kleineweber
Browse files

Merge branch 'lkairies-osd-smart-status' 

Conflicts:
	doc/xtreemfs-userguide/xtfs-guide.pdf
parents 9e3a0d96 488837ab
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