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

Merge stable-2.7 into stable-2.8 


Conflicts:
	INSTALL
	NEWS
	configure.ac
	src/Ganeti/Query/Group.hs
	test/hs/Test/Ganeti/Objects.hs
	test/hs/Test/Ganeti/Query/Query.hs

Signed-off-by: default avatarMichele Tartara <mtartara@google.com>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parents 25f8d59c 7d60c3b5
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 207 additions and 41 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