Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: fix file conflict when upgrading setup due to
versionlock
......................................................................
packaging: fix file conflict when upgrading setup due to versionlock
Change-Id: I2f69ac24b375ecbc0abecec4f617cfb97309e390
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M ovirt-engine.spec.in
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/15284/1
diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in
index 0921cf7..2ed1c9a 100644
--- a/ovirt-engine.spec.in
+++ b/ovirt-engine.spec.in
@@ -584,6 +584,8 @@
# 3.4
%{engine_data}/conf/engine-config-install.properties
%{engine_data}/conf/ovirt-engine-proxy.conf.in
+%{engine_data}/conf/iptables.default
+%{engine_data}/conf/nfs.sysconfig
# Documentation:
%doc LICENSE
@@ -733,8 +735,6 @@
%{_mandir}/man8/engine-upgrade.*
# Configuration files
-%{engine_data}/conf/iptables.default
-%{engine_data}/conf/nfs.sysconfig
%{engine_data}/conf/ovirt-engine-root-redirect.conf.in
%{engine_data}/conf/version
--
To view, visit http://gerrit.ovirt.org/15284
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f69ac24b375ecbc0abecec4f617cfb97309e390
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
