« Previous | Next » 

Revision cee32223

IDcee322234c8bd801ac1d29a7f52e0ce7b95c78b3

Added by Michael Hanselmann over 13 years ago

Merge branch 'devel-2.3'

  • devel-2.3:
    Fix typo in gnt-instance manpage
    jqueue: Fix cancelling while in waitlock in queue
    cli: Extend message for LUXI timeouts
    Fix timeout handling in LUXI client

Conflicts:
man/gnt-instance.sgml: Trivial merge in gnt-instance.rst

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted