« Previous | Next » 

Revision 3eaa6e1d

ID3eaa6e1d6e1bf3b845d66b2343253f8e170cadd2
Parent 89c63fbe, 7bc2c097
Child 52a988f2

Added by Klaus Aehlig about 7 years ago

Merge branch 'stable-2.8' into stable-2.9

  • stable-2.8
    Add support for blktap2 file-driver
    Update opcodes test to include network tags
    Make network tags searchable
    Add network tag tests to QA
    Fix RAPI network tag handling
    Fix gnt-network list-tags

Conflicts:
lib/cmdlib/tags.py
test/py/ganeti.hypervisor.hv_xen_unittest.py
Resolution: manually apply the changes from stable-2.8 to
the stable-2.9 code.

Signed-off-by: Klaus Aehlig <>
Reviewed-by: Guido Trotter <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted