« Previous | Next » 

Revision 112aee5f

ID112aee5f8f358be4c1c442a25332c40138f56946
Child be3f52f3

Added by Iustin Pop almost 12 years ago

Merge branch 'stable-2.6'

  • stable-2.6: (72 commits)
    Make Ganeti 2.6.0 rc3 release
    Allow reinstall even when secondaries are offline
    Prepare NEWS file for Ganeti 2.6.0 rc3
    QA updated to test instance removing when sec. is offline
    Ignore offline node errors when removing disks
    Allow instance disc activation with offline secondaries
    RAPI regression beparams/memory fix
    Fix redistribution of files w.r.t. offline nodes
    Fix cluster verify error on master-ip-setup script
    Add a Makefile rule to test unclean git status
    Add test helpers to .gitignore
    Fix a typo in NEWS
    Release Ganeti 2.6.0rc2
    Prepare NEWS file for 2.6.0 rc2
    Update time on Haskell binaries after build
    hcheck: add two simple type aliases for readability
    hcheck: rework output mode
    hcheck: reword and fix typo in instance/offline msg
    Add hlint warning for wrong use of 'length'
    Remove can_rebalance functionality from hcheck
    ...

Conflicts:
htools/Ganeti/HTools/QC.hs: due to the cleanup of missing type
signatures, and the fact that in master two test functions had
a changed argument list, trivial to fix

Signed-off-by: Iustin Pop <>
Reviewed-by: René Nussbaumer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted