Merge branch 'devel-2.1'
* devel-2.1: RAPI: /2/{nodes,instances}/$name should return 404 for unknown items ganeti-masterd: Improve error logging for client requests Return disk_template from LUQueryInstanceData RAPI client: Rename Get{Node,Instance}Info, add new GetInstanceInfo RAPI client: Log request to be made Add missing documentation for RAPI instance creation mode Add checks for master IP in cluster verify Remove unused import from daemon.py utils.IgnoreSignals AsyncUDPSocket.handle_error Add a forgotten comment about overriding a method ganeti-noded: add the --no-mlock option Describe more ganeti-noded options in the manpage Conflicts: daemons/ganeti-masterd: Trivial test/ganeti.backend_unittest.py: Trivial test/ganeti.utils_unittest.py: Trivial Signed-off-by:Michael Hanselmann <hansmi@google.com> Reviewed-by:
Iustin Pop <iustin@google.com>
Showing
- daemons/ganeti-masterd 2 additions, 1 deletiondaemons/ganeti-masterd
- daemons/ganeti-noded 10 additions, 2 deletionsdaemons/ganeti-noded
- doc/rapi.rst 2 additions, 0 deletionsdoc/rapi.rst
- lib/backend.py 13 additions, 2 deletionslib/backend.py
- lib/cmdlib.py 16 additions, 1 deletionlib/cmdlib.py
- lib/constants.py 1 addition, 0 deletionslib/constants.py
- lib/daemon.py 19 additions, 41 deletionslib/daemon.py
- lib/rapi/baserlib.py 14 additions, 0 deletionslib/rapi/baserlib.py
- lib/rapi/client.py 31 additions, 6 deletionslib/rapi/client.py
- lib/rapi/rlib2.py 9 additions, 4 deletionslib/rapi/rlib2.py
- lib/utils.py 14 additions, 0 deletionslib/utils.py
- man/ganeti-noded.sgml 28 additions, 0 deletionsman/ganeti-noded.sgml
- test/ganeti.backend_unittest.py 23 additions, 0 deletionstest/ganeti.backend_unittest.py
- test/ganeti.rapi.client_unittest.py 23 additions, 4 deletionstest/ganeti.rapi.client_unittest.py
- test/ganeti.utils_unittest.py 39 additions, 2 deletionstest/ganeti.utils_unittest.py
Loading
Please register or sign in to comment