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.
Showing
- devel/release 49 additions, 0 deletionsdevel/release
- lib/__init__.py 2 additions, 0 deletionslib/__init__.py
- lib/backend.py 5 additions, 1 deletionlib/backend.py
- lib/bdev.py 1 addition, 1 deletionlib/bdev.py
- lib/cli.py 2 additions, 2 deletionslib/cli.py
- lib/cmdlib.py 19 additions, 7 deletionslib/cmdlib.py
- lib/errors.py 1 addition, 1 deletionlib/errors.py
- lib/http/client.py 1 addition, 1 deletionlib/http/client.py
- lib/hypervisor/hv_fake.py 1 addition, 1 deletionlib/hypervisor/hv_fake.py
- lib/jstore.py 4 additions, 3 deletionslib/jstore.py
- lib/locking.py 8 additions, 5 deletionslib/locking.py
- lib/objects.py 2 additions, 0 deletionslib/objects.py
- lib/rapi/baserlib.py 4 additions, 0 deletionslib/rapi/baserlib.py
- lib/rapi/connector.py 4 additions, 0 deletionslib/rapi/connector.py
- lib/rapi/rlib2.py 4 additions, 0 deletionslib/rapi/rlib2.py
- lib/rpc.py 4 additions, 3 deletionslib/rpc.py
- lib/serializer.py 4 additions, 0 deletionslib/serializer.py
- pylintrc 22 additions, 15 deletionspylintrc
Loading
Please register or sign in to comment