|
 |
26ba25 |
From a7d31b5b668307b4ce48344e4aab8afb413e8c50 Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Date: Tue, 26 Jun 2018 09:48:54 +0200
|
|
|
26ba25 |
Subject: [PATCH 146/268] jobs: fix verb references in docs
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Message-id: <20180626094856.6924-72-kwolf@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 81108
|
|
|
26ba25 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 71/73] jobs: fix verb references in docs
|
|
|
26ba25 |
Bugzilla: 1513543
|
|
|
26ba25 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
From: John Snow <jsnow@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
These point to the job versions now, not the blockjob versions which
|
|
|
26ba25 |
don't really exist anymore.
|
|
|
26ba25 |
|
|
|
26ba25 |
Except set-speed, which does. It sticks out like a sore thumb. This
|
|
|
26ba25 |
patch doesn't fix that, but it doesn't make it any worse, either.
|
|
|
26ba25 |
|
|
|
26ba25 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
26ba25 |
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
|
26ba25 |
Reviewed-by: Markus Armbruster <armbru@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
(cherry picked from commit b8a366feb2aa2200c42fa983a9c607fb78a501db)
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
qapi/job.json | 12 ++++++------
|
|
|
26ba25 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/qapi/job.json b/qapi/job.json
|
|
|
26ba25 |
index 2264435..9d074eb 100644
|
|
|
26ba25 |
--- a/qapi/job.json
|
|
|
26ba25 |
+++ b/qapi/job.json
|
|
|
26ba25 |
@@ -76,19 +76,19 @@
|
|
|
26ba25 |
#
|
|
|
26ba25 |
# Represents command verbs that can be applied to a job.
|
|
|
26ba25 |
#
|
|
|
26ba25 |
-# @cancel: see @block-job-cancel
|
|
|
26ba25 |
+# @cancel: see @job-cancel
|
|
|
26ba25 |
#
|
|
|
26ba25 |
-# @pause: see @block-job-pause
|
|
|
26ba25 |
+# @pause: see @job-pause
|
|
|
26ba25 |
#
|
|
|
26ba25 |
-# @resume: see @block-job-resume
|
|
|
26ba25 |
+# @resume: see @job-resume
|
|
|
26ba25 |
#
|
|
|
26ba25 |
# @set-speed: see @block-job-set-speed
|
|
|
26ba25 |
#
|
|
|
26ba25 |
-# @complete: see @block-job-complete
|
|
|
26ba25 |
+# @complete: see @job-complete
|
|
|
26ba25 |
#
|
|
|
26ba25 |
-# @dismiss: see @block-job-dismiss
|
|
|
26ba25 |
+# @dismiss: see @job-dismiss
|
|
|
26ba25 |
#
|
|
|
26ba25 |
-# @finalize: see @block-job-finalize
|
|
|
26ba25 |
+# @finalize: see @job-finalize
|
|
|
26ba25 |
#
|
|
|
26ba25 |
# Since: 2.12
|
|
|
26ba25 |
##
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|