Skip to content
Snippets Groups Projects
Commit f2d87a5e authored by Michele Tartara's avatar Michele Tartara
Browse files

Merge remote-tracking branch 'origin/stable-2.8' 


Conflicts:
	lib/bdev.py
	lib/cmdlib.py

Signed-off-by: default avatarMichele Tartara <mtartara@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parents 8a96e60d 9db0b351
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 316 additions and 83 deletions
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