« Previous | Next » 

Revision 2f7140ba


Added by Guido Trotter almost 15 years ago

Merge branch 'next' into branch-2.1

  • next:
    Create a new --no-voting option for masterfailover
    ganeti-masterd: allow non-interactive --no-voting
    Fix pylint warnings
    Add custom pylintrc
    bootstrap: Don't leak file descriptor when generating SSL certificate
    Fix problem with EAGAIN on socket connection in clients
    Fix some typos
    Increase maximum accepted size for a DRBD meta dev
    Cleanup config data when draining nodes
    Fix node readd issues
    backend.DemoteFromMC: don't fail for missing files
    Allow GetMasterCandidateStats to ignore some nodes
    Fix error message for extra files on non MC nodes


Most of the conflicts where in the new rpcs VS pylint fixes
and usually the new rpcs fixed the pylint problems as well
Small conflict between masterfailover --no-voting and new rpcs
Net parameters conflicted here, kept that version
Same problem fixed in two different ways. 'next' version kept

Signed-off-by: Guido Trotter <>


  • added
  • modified
  • copied
  • renamed
  • deleted