Skip to content
Snippets Groups Projects
Commit 1c54156d authored by Luca Bigliardi's avatar Luca Bigliardi
Browse files

Merge branch 'devel-2.1'


Conflicts:
	daemons/ganeti-noded
	lib/daemon.py
	lib/rapi/baserlib.py
	lib/rapi/rlib2.py
	lib/utils.py

Signed-off-by: default avatarLuca Bigliardi <shammash@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 40523663 20601361
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment