« Previous | Next » 

Revision d984846d

IDd984846ddf447c4eab67bd112cb5a52456f3fd3b

Added by Iustin Pop over 11 years ago

Merge branch 'devel-2.0' into devel-2.1

  • devel-2.0:
    Fix indentation in hv_kvm
    Implement BuildHooksEnv for NoHooksLU
    Clarifiy some more wide pylint disables
    Fix two bugs in seldom-used codepaths
    Update pylintrc
    Add targetted pylint disables
    Partial cherry-pick of 6c881c5 from the 2.1 branch
    Add a release script
    Fix a typo in the doc string

Conflicts:
lib/cli.py
lib/cmdlib.py
lib/hypervisor/hv_kvm.py
lib/jstore.py
lib/locking.py
lib/mcpu.py
lib/rapi/rlib2.py

Many of the conflicts were on code removed from 2.1, so the resolving was
trivial.

Files

  • added
  • modified
  • copied
  • renamed
  • deleted