« Previous | Next » 

Revision 3398bff1

ID3398bff14c7e92c7a8ffd88b2b9ac63ccd883289
Parent e87e5afb, cea3abbd
Child f047f90f

Added by Andrea Spadaccini over 9 years ago

Merge branch 'devel-2.5'

  • devel-2.5:
    Use --yes to deactivate master ip in cluster merge
    Use deactivate-master-ip in cluster-merge
    Add gnt-cluster commands to toggle the master IP
    Split starting and stopping master IP and daemons
    listrunner: Don't pass arguments if there are none
    ssh: Quote strings in error message
    utils.log: Write error messages to stderr
    Add signal handling doc to hbal man page
    Migration: warn the user about hv version mismatch
    Fix handling of cluster verify hooks
    Redistribute the RAPI certificate
    QA: Add tests for instance start/stop via RAPI
    RAPI: Fix wrong check on instance shutdown
    baserlib: Accept empty body in FillOpcode

Conflicts:
lib/backend.py
- no real conflicts
lib/constants.py
- preserve both changes
lib/rapi/rlib2.py
- keep master
lib/rpc.py
- no real conflicts
tools/cluster-merge
- keep devel-2.5

Signed-off-by: Andrea Spadaccini <>
Reviewed-by: Guido Trotter <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted