« Previous | Next » 

Revision 31ff0247

ID31ff02477d8d0bea8d8d125d4c116a146c8cbb21

Added by Michael Hanselmann about 12 years ago

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 <>
Reviewed-by: Iustin Pop <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted