[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 03/26] jobs: fix stale wording
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 03/26] jobs: fix stale wording |
Date: |
Fri, 15 Jun 2018 16:20:45 +0200 |
From: John Snow <address@hidden>
During the design for manual completion, we decided not to use the
"manual" property as a shorthand for both auto-dismiss and auto-finalize.
Fix the wording.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
qapi/job.json | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/qapi/job.json b/qapi/job.json
index 17d10037c4..226443594b 100644
--- a/qapi/job.json
+++ b/qapi/job.json
@@ -50,16 +50,17 @@
# the last job in a transaction.
#
# @pending: The job has finished its work, but has finalization steps that it
-# needs to make prior to completing. These changes may require
-# manual intervention by the management process if manual was set
-# to true. These changes may still fail.
+# needs to make prior to completing. These changes will require
+# manual intervention via @job-finalize if auto-finalize was set to
+# false. These pending changes may still fail.
#
# @aborting: The job is in the process of being aborted, and will finish with
# an error. The job will afterwards report that it is @concluded.
# This status may not be visible to the management process.
#
-# @concluded: The job has finished all work. If manual was set to true, the job
-# will remain in the query list until it is dismissed.
+# @concluded: The job has finished all work. If auto-dismiss was set to false,
+# the job will remain in the query list until it is dismissed via
+# @job-dismiss.
#
# @null: The job is in the process of being dismantled. This state should not
# ever be visible externally.
--
2.13.6
- [Qemu-block] [PULL 00/26] Block layer patches, Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 02/26] iotests: Add test 221 to catch qemu-img map regression, Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 04/26] jobs: fix verb references in docs, Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 01/26] qemu-img: Fix assert when mapping unaligned raw file, Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 03/26] jobs: fix stale wording,
Kevin Wolf <=
- [Qemu-block] [PULL 06/26] iscsi: Drop deprecated -drive parameter "filename", Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 07/26] block: Add block-specific QDict header, Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 05/26] rbd: Drop deprecated -drive parameter "filename", Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 09/26] block: Fix -blockdev for certain non-string scalars, Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 15/26] block-qdict: Tweak qdict_flatten_qdict(), qdict_flatten_qlist(), Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 10/26] block: Fix -drive for certain non-string scalars, Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 14/26] block-qdict: Simplify qdict_flatten_qdict(), Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 12/26] block: Factor out qobject_input_visitor_new_flat_confused(), Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 16/26] block-qdict: Clean up qdict_crumple() a bit, Kevin Wolf, 2018/06/15
- [Qemu-block] [PULL 11/26] block: Clean up a misuse of qobject_to() in .bdrv_co_create_opts(), Kevin Wolf, 2018/06/15