Merge remote branch 'devel-2.1'
* devel-2.1: (40 commits) Fix unused imports or add silences where needed bdev: Add a TODO and a pylint silence confd: add a TODO and a pylint disable pylint: Temporarily disable W0201 Disable R0922 in pylint Further pylint disables, mostly for Unused args pylint: disable the similarities checker LUDiagnoseOS._DiagnoseByOS: remove unused arg daemons: handle arguments correctly and uniformly hv_xen/_GetConfigFileDiskData: remove unused arg jqueue/_CheckRpcResult: log the whole operation Optparse extenders have to obey a given API backend._OSOndiskAPIVersion: remove obsolete arg pylint cleanups: dangerous initializers Convert to static methods (where appropriate) Remove more unused variables Add targeted pylint disables burnin: move decorators out of classes Rename an ConfdInotifyEventHandler init argument Introduce a makefile lint rule ... Conflicts: daemons/ganeti-confd - removed imports daemons/ganeti-noded - fixed new GenericMain
Showing
- Makefile.am 8 additions, 0 deletionsMakefile.am
- daemons/ganeti-confd 26 additions, 15 deletionsdaemons/ganeti-confd
- daemons/ganeti-masterd 20 additions, 7 deletionsdaemons/ganeti-masterd
- daemons/ganeti-noded 24 additions, 7 deletionsdaemons/ganeti-noded
- daemons/ganeti-rapi 12 additions, 11 deletionsdaemons/ganeti-rapi
- daemons/ganeti-watcher 13 additions, 6 deletionsdaemons/ganeti-watcher
- devel/release 49 additions, 0 deletionsdevel/release
- lib/__init__.py 2 additions, 0 deletionslib/__init__.py
- lib/asyncnotifier.py 4 additions, 3 deletionslib/asyncnotifier.py
- lib/backend.py 16 additions, 11 deletionslib/backend.py
- lib/bdev.py 21 additions, 3 deletionslib/bdev.py
- lib/build/__init__.py 1 addition, 0 deletionslib/build/__init__.py
- lib/cli.py 7 additions, 6 deletionslib/cli.py
- lib/cmdlib.py 49 additions, 27 deletionslib/cmdlib.py
- lib/confd/client.py 2 additions, 1 deletionlib/confd/client.py
- lib/confd/querylib.py 9 additions, 9 deletionslib/confd/querylib.py
- lib/confd/server.py 4 additions, 4 deletionslib/confd/server.py
- lib/config.py 4 additions, 4 deletionslib/config.py
- lib/daemon.py 2 additions, 2 deletionslib/daemon.py
- lib/errors.py 1 addition, 1 deletionlib/errors.py
Loading
Please register or sign in to comment