« Previous | Next » 

Revision e7a25b08

IDe7a25b0864e9ffa10b35e1d808bb092ec161e7e9

Added by Guido Trotter over 11 years ago

Merge branch 'devel-2.1'

  • devel-2.1:
    burnin: only remove instances we actually added
    burnin.ExecOrQueue: add post-process function
    burnin.ExecOrQueue: remove variable argument list
    Fix new pylint errors
    Rename the confd_client unittest (to confd.client)
    Make watcher request the max coverage
    ConfdClient.SendRequest: allow max coverage
    Document the watcher node maintenance feature
    Watcher: automatic shutdown of orphan resources
    Export the maintain_node_health option in ssconf
    Add a new cluster parameter maintain_node_health
    Add a new confd callback (StoreResultCallback)
    ConfdClient: add synchronous wait for replies mode
    ConfdClient: unify some internal variables

Conflicts:
daemons/ganeti-masterd
change moved to luxi.py

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted