Merge branch 'devel-2.3'
* devel-2.3: jqueue: Keep jobs in “waitlock” while returning to queue Improve jqueue unittests Update manpages to display version 2.3 Conflicts: man/ganeti-cleaner.sgml: Removed man/ganeti-confd.sgml: Removed man/ganeti-masterd.sgml: Removed man/ganeti-noded.sgml: Removed man/ganeti-os-interface.sgml: Removed man/ganeti-rapi.sgml: Removed man/ganeti-watcher.sgml: Removed man/ganeti.sgml: Removed man/gnt-backup.sgml: Removed man/gnt-cluster.sgml: Removed man/gnt-debug.sgml: Removed man/gnt-instance.sgml: Removed man/gnt-job.sgml: Removed man/gnt-node.sgml: Removed man/gnt-os.sgml: Removed Signed-off-by:Michael Hanselmann <hansmi@google.com> Reviewed-by:
Iustin Pop <iustin@google.com>
No related branches found
No related tags found
Loading
Please register or sign in to comment