« Previous | Next » 

Revision cbfa4f0f

IDcbfa4f0f4df293b3f774d4dd7d2160c130f45fb4
Parent a1e43376, e41a1c0c
Child e26096bd

Added by Michael Hanselmann over 10 years ago

Merge branch 'devel-2.4'

  • devel-2.4: (60 commits)
    Update news and bump version for 2.4.0 rc2
    Fix pylint warnings
    TestRapiInstanceRename use instance name
    Change the list formatting to a 'special' chars
    Add support for merging node groups
    Add option to rename groups on conflict
    Fix minor docstring typo
    Add QA rapi test for instance reinstall
    RAPI: remove required parameters for reinstall
    Fix HV/OS parameter validation on non-vm nodes
    NodeQuery: mark live fields as UNAVAIL for non-vm_capable nodes
    NodeQuery: don't query non-vm_capable nodes
    Fix LUClusterRepairDiskSizes and rpc result usage
    Fix RPC mismatch in blockdev_getsize[s]
    Remove superfluous redundant requirement
    Don't remove master_candidate flag from merged nodes
    Use a consistent ECID base
    listrunner: convert from getopt to optparse
    listrunner: fix agent usage
    Revert "Disable the cluster-merge tool for the moment"
    ...

Conflicts:
NEWS: Trivial
lib/cli.py: Dropped _RSTATUS_TO_TEXT from master and used
RSS_DESCRIPTION from devel-2.4 instead, adjusted users accordingly

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted