|
 |
26ba25 |
From c0c27707f886ddbf8bc853bf8f798278b1bb713d Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Date: Tue, 26 Jun 2018 09:48:53 +0200
|
|
|
26ba25 |
Subject: [PATCH 145/268] jobs: fix stale wording
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Message-id: <20180626094856.6924-71-kwolf@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 81107
|
|
|
26ba25 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 70/73] jobs: fix stale wording
|
|
|
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 |
During the design for manual completion, we decided not to use the
|
|
|
26ba25 |
"manual" property as a shorthand for both auto-dismiss and auto-finalize.
|
|
|
26ba25 |
|
|
|
26ba25 |
Fix the wording.
|
|
|
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 c5b09f3f2c4db32f39ecbde2cf2f78e7a657a85d)
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
qapi/job.json | 11 ++++++-----
|
|
|
26ba25 |
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/qapi/job.json b/qapi/job.json
|
|
|
26ba25 |
index 17d1003..2264435 100644
|
|
|
26ba25 |
--- a/qapi/job.json
|
|
|
26ba25 |
+++ b/qapi/job.json
|
|
|
26ba25 |
@@ -50,16 +50,17 @@
|
|
|
26ba25 |
# the last job in a transaction.
|
|
|
26ba25 |
#
|
|
|
26ba25 |
# @pending: The job has finished its work, but has finalization steps that it
|
|
|
26ba25 |
-# needs to make prior to completing. These changes may require
|
|
|
26ba25 |
-# manual intervention by the management process if manual was set
|
|
|
26ba25 |
-# to true. These changes may still fail.
|
|
|
26ba25 |
+# needs to make prior to completing. These changes will require
|
|
|
26ba25 |
+# manual intervention via @job-finalize if auto-finalize was set to
|
|
|
26ba25 |
+# false. These pending changes may still fail.
|
|
|
26ba25 |
#
|
|
|
26ba25 |
# @aborting: The job is in the process of being aborted, and will finish with
|
|
|
26ba25 |
# an error. The job will afterwards report that it is @concluded.
|
|
|
26ba25 |
# This status may not be visible to the management process.
|
|
|
26ba25 |
#
|
|
|
26ba25 |
-# @concluded: The job has finished all work. If manual was set to true, the job
|
|
|
26ba25 |
-# will remain in the query list until it is dismissed.
|
|
|
26ba25 |
+# @concluded: The job has finished all work. If auto-dismiss was set to false,
|
|
|
26ba25 |
+# the job will remain in the query list until it is dismissed via
|
|
|
26ba25 |
+# @job-dismiss.
|
|
|
26ba25 |
#
|
|
|
26ba25 |
# @null: The job is in the process of being dismantled. This state should not
|
|
|
26ba25 |
# ever be visible externally.
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|