Skip to content
Commit d6850378 authored by Jacobo Giralt's avatar Jacobo Giralt
Browse files

Merge branch 'logger' into integration-1st-round 



Updates to remove example code if not enabled.

Solved conflicts:
	block/elevator.c

Signed-off-by: default avatarJacobo Giralt <jacobo.giralt@bsc.es>
parents d0bd98cb a93607b1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment