Skip to content
Snippets Groups Projects
Commit d984846d authored by Iustin Pop's avatar Iustin Pop
Browse files

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 6c881c52 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.
parents fa05c92d 146afafb
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment