« Previous | Next » 

Revision 7dcf333d

ID7dcf333ded48a7dcf71a1e51f93f1ecef4a20c94
Parent e3ac8406, fd7b69c0
Child 0f03d8d4

Added by Michael Hanselmann almost 10 years ago

Merge branch 'devel-2.5'

  • devel-2.5:
    Fix wrong headers and licences
    Update NEWS and increase to 2.4.5
    Fix parameters of RpcResult in hooks unit tests
    Fix a too long line.
    Move RenameFile to the new functions
    ensure_dirs: Move some useful functions into utils.
    Use JoinDisjointDicts in mcpu
    Add the JoinDisjointDicts function to utils.algo
    Fix queue archive creation with wrong permissions
    Ensure permission on the job queue version file
    OpGroupVerifyDisks: Fix wrong result type declaration
    RAPI: Make node evacuation actually work
    Bump version to 2.5.0~rc2
    Update NEWS for unreleased 2.4.5
    RAPI: Fix resource for replacing disks

Conflicts:
lib/rapi/rlib2.py: Merged bugfix from commit 539d65ba0

Signed-off-by: Michael Hanselmann <>
Reviewed-by: René Nussbaumer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted