Oved Ourfali has uploaded a new change for review.

Change subject: tools : engine-config's manual should be updated regarding new 
command --merge
......................................................................

tools : engine-config's manual should be updated regarding new command --merge

engine-config --help should display the newly added
merge action.

Change-Id: I62a510f4c3dde79630af96ffb4ca010301b3cd13
Bug-Url: https://bugzilla.redhat.com/1091942
Signed-off-by: Ravi Nori <[email protected]>
(cherry picked from commit 776a8acf1741516e3d4b02d05ff0b2a4d75cef7c)
---
M packaging/bin/engine-config.sh
M packaging/man/man8/engine-config.8
2 files changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/27172/1

diff --git a/packaging/bin/engine-config.sh b/packaging/bin/engine-config.sh
index 60f17a6..08e7c46 100755
--- a/packaging/bin/engine-config.sh
+++ b/packaging/bin/engine-config.sh
@@ -24,6 +24,9 @@
        -s KEY=VALUE, --set KEY=VALUE
            Set the value of the given key for the given version. The version 
is required for this action only when the version is not 'general'.
 
+       -m KEY=VALUE, --merge KEY=VALUE
+           Merge the value of the given key for the given version with the 
value in the database. The version is required for this action only when the 
version is not 'general'.
+
        -h, --help
            Show this help message and exit.
 
diff --git a/packaging/man/man8/engine-config.8 
b/packaging/man/man8/engine-config.8
index 172d7c4..8cf4bbb 100644
--- a/packaging/man/man8/engine-config.8
+++ b/packaging/man/man8/engine-config.8
@@ -25,6 +25,11 @@
 Set the value of the given key for the given version. The version is required 
for this action only when the version is not 'general'.
 .RE
 .PP
+\fB\-m\fR \fIKEY\fR=\fIVALUE\fR, \fB\-\-merge\fR \fIKEY\fR=\fIVALUE\fR
+.RS 4
+Merge the value of the given key for the given version with the value in the 
database. The version is required for this action only when the version is not 
'general'.
+.RE
+.PP
 \fB\-h\fR, \fB\-\-help\fR
 .RS 4
 Show this help message and exit.


-- 
To view, visit http://gerrit.ovirt.org/27172
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62a510f4c3dde79630af96ffb4ca010301b3cd13
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Oved Ourfali <[email protected]>
Gerrit-Reviewer: Ravi Nori <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to