« Previous | Next » 

Revision ae8419a2

IDae8419a2903cb27e79d7bbb5117d90352f3375a8

Added by Michael Hanselmann over 10 years ago

Merge branch 'devel-2.2'

  • devel-2.2:
    cli: Use list of options shared between commands
    jqueue: Use separate function for encoding errors
    Fix some epydoc warnings
    Fix breakage introduced by commit 8044bf655
    Remove “dry_run” from opcodes.OpCreateInstance
    Disable the RAPI CA checks in watcher
    move-instance: Fix parameter order in _CreateInstance

Conflicts:
daemons/ganeti-watcher: Trivial
lib/cli.py: Trivial

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Guido Trotter <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted