Revision cee32223
ID | cee322234c8bd801ac1d29a7f52e0ce7b95c78b3 |
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 <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Files
- added
- modified
- copied
- renamed
- deleted