Change in ovirt-engine[master]: webadmin: re-order gluster hook conflict actions
by kmayilsa@redhat.com
Kanagaraj M has submitted this change and it was merged.
Change subject: webadmin: re-order gluster hook conflict actions
......................................................................
webadmin: re-order gluster hook conflict actions
When a hook has both content and missing conflicts
if the user selects 'Remove' to resolve a missing
conflict then the content conflict actions should be disabled.
Also moved the missing conflict to the top.
Change-Id: Ic7d425f79b0c0c22605b2343e892851de33f16e9
Bug-Url: https://bugzilla.redhat.com/975795
Signed-off-by: Kanagaraj M <kmayilsa(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/GlusterHookResolveConflictsModel.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.ui.xml
2 files changed, 18 insertions(+), 8 deletions(-)
Approvals:
Kanagaraj M: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/16630
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7d425f79b0c0c22605b2343e892851de33f16e9
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Kanagaraj M <kmayilsa(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Kanagaraj M <kmayilsa(a)redhat.com>
Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 5 months
Change in ovirt-engine[master]: webadmin: deny resizing hook content textarea
by kmayilsa@redhat.com
Kanagaraj M has submitted this change and it was merged.
Change subject: webadmin: deny resizing hook content textarea
......................................................................
webadmin: deny resizing hook content textarea
Disabling the resize property of the textarea which
will show the hook content.
Change-Id: I70be9768c5e5a250e16dc57c2a125b9978a86d1d
Bug-Url: https://bugzilla.redhat.com/975805
Signed-off-by: Kanagaraj M <kmayilsa(a)redhat.com>
---
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.ui.xml
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Kanagaraj M: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/16654
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70be9768c5e5a250e16dc57c2a125b9978a86d1d
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Kanagaraj M <kmayilsa(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Kanagaraj M <kmayilsa(a)redhat.com>
Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 5 months
Change in ovirt-engine[master]: core: Normalize default VM time zone representation
by ofrenkel@redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: core: Normalize default VM time zone representation
......................................................................
core: Normalize default VM time zone representation
Added db migration script to update old VMs from engine versions which
used empty string to represent 'Use default TimeZone' to value of NULL
which is used currently.
Change-Id: Ia5ffcfef3b2f1930e65c2f66e26c265df31e0813
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=988259
Signed-off-by: Martin Betak <mbetak(a)redhat.com>
---
A packaging/dbscripts/upgrade/03_03_0780_convert_empty_timezone_to_null.sql
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Martin Betak: Verified
Omer Frenkel: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/17672
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5ffcfef3b2f1930e65c2f66e26c265df31e0813
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Betak <mbetak(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
11 years, 5 months
Change in ovirt-engine[master]: userportal : Fix DiskForVmGuid high CPU
by emesika@redhat.com
Eli Mesika has submitted this change and it was merged.
Change subject: userportal : Fix DiskForVmGuid high CPU
......................................................................
userportal : Fix DiskForVmGuid high CPU
In this patch we remove the need to load all disk data and just load the
required information for the user portal.
This patch was first committed and merged as
http://gerrit.ovirt.org/#/c/16657/ and then reverted due to DAO tests
failure.
this commit has exactly the same changes as the original patch, the only
change is in the TEST class, the problem was that the test checked the
description field for NULL while it was set by the fixtures.xml to "New
Description"
Change-Id: I1d7369cfbfe9b7c6901bd1bc2e9c16bdc31a9af9
Bug URL: https://bugzilla.redhat.com/show_bug.cgi?id=971237
Signed-off-by: Eli Mesika <emesika(a)redhat.com>
---
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksPartialDataByVmIdQuery.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDao.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDaoDbFacadeImpl.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskDaoTest.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmBasicDiskListModel.java
M packaging/dbscripts/all_disks_sp.sql
7 files changed, 104 insertions(+), 11 deletions(-)
Approvals:
Eli Mesika: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18268
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d7369cfbfe9b7c6901bd1bc2e9c16bdc31a9af9
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Liran Zelkha <liran.zelkha(a)gmail.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 5 months
Change in ovirt-engine[master]: restapi: The add vm/template nic api requires name
by masayag@redhat.com
Moti Asayag has submitted this change and it was merged.
Change subject: restapi: The add vm/template nic api requires name
......................................................................
restapi: The add vm/template nic api requires name
The patch adds the nic name as a mandatory field for
adding a nic to a vm or template.
Change-Id: I36db94eb18bd5250dbd346886aead2f843d9a0ab
Signed-off-by: Moti Asayag <masayag(a)redhat.com>
---
M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Moti Asayag: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18179
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36db94eb18bd5250dbd346886aead2f843d9a0ab
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
11 years, 5 months
Change in ovirt-engine[master]: restapi: Declare vnic add/update methods as deprecated
by masayag@redhat.com
Moti Asayag has submitted this change and it was merged.
Change subject: restapi: Declare vnic add/update methods as deprecated
......................................................................
restapi: Declare vnic add/update methods as deprecated
The patch uses the conventional method of declaring a
method signature as deprecated for add/update vnics of
vm or template.
Change-Id: I343ae94438004099a9c2da2c8cd5a12766318a7b
Signed-off-by: Moti Asayag <masayag(a)redhat.com>
---
M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Moti Asayag: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18048
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I343ae94438004099a9c2da2c8cd5a12766318a7b
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
11 years, 5 months
Change in ovirt-engine[master]: notifier: Use Runtime.addShutdownHook to catch shutdown signals
by emesika@redhat.com
Eli Mesika has submitted this change and it was merged.
Change subject: notifier: Use Runtime.addShutdownHook to catch shutdown signals
......................................................................
notifier: Use Runtime.addShutdownHook to catch shutdown signals
Use Runtime.addShutdownHook to catch process shutdown
(SIGTERM, SIGINT, SIGHUP) and not sun's proprietary
sun.misc package. Runtime.addShutdownHook is JVM
agnostic and has the advantage of executing the same
if the service was killed or the java process it self.
Change-Id: I71b3a2a54862b9c3ca1fb6d2c32f127b833953de
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=749513
Signed-off-by: Mooli Tayer <mtayer(a)redhat.com>
---
M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/Notifier.java
1 file changed, 5 insertions(+), 7 deletions(-)
Approvals:
Eli Mesika: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/17666
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71b3a2a54862b9c3ca1fb6d2c32f127b833953de
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 5 months
Change in ovirt-log-collector[ovirt-log-collector-3.3]: sos: engine: collect more state file
by sbonazzo@redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: sos: engine: collect more state file
......................................................................
sos: engine: collect more state file
Collect also:
/var/lib/ovirt-engine/setup/answers
/var/lib/ovirt-engine/external_truststore
Change-Id: I042343417e5b05da258b13eccea29cea65f46e44
Requires: http://gerrit.ovirt.org/18198
Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com>
---
M src/sos/plugins/engine.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Sandro Bonazzola: Verified; Looks good to me, approved
Kiril Nesenko: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18276
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I042343417e5b05da258b13eccea29cea65f46e44
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-log-collector
Gerrit-Branch: ovirt-log-collector-3.3
Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Keith Robertson <kroberts(a)redhat.com>
Gerrit-Reviewer: Kiril Nesenko <knesenko(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
11 years, 5 months
Change in ovirt-log-collector[master]: sos: engine: collect more state file
by sbonazzo@redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: sos: engine: collect more state file
......................................................................
sos: engine: collect more state file
Collect also:
/var/lib/ovirt-engine/setup/answers
/var/lib/ovirt-engine/external_truststore
Change-Id: I042343417e5b05da258b13eccea29cea65f46e44
Requires: http://gerrit.ovirt.org/18198
Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com>
---
M src/sos/plugins/engine.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Sandro Bonazzola: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18204
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I042343417e5b05da258b13eccea29cea65f46e44
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-log-collector
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Keith Robertson <kroberts(a)redhat.com>
Gerrit-Reviewer: Kiril Nesenko <knesenko(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
11 years, 5 months
Change in ovirt-log-collector[master]: build: post ovirt-log-collector-3.3 branching
by sbonazzo@redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: build: post ovirt-log-collector-3.3 branching
......................................................................
build: post ovirt-log-collector-3.3 branching
Now that the 3.3 branch has been created master should be
changed to 3.4.
Change-Id: Ic5b2a8e9e51946bc6a148fe13abd4bd7ba7bc09d
Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com>
---
M configure.ac
M ovirt-log-collector.spec.in
2 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
Sandro Bonazzola: Verified; Looks good to me, approved
Kiril Nesenko: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18209
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5b2a8e9e51946bc6a148fe13abd4bd7ba7bc09d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-log-collector
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Keith Robertson <kroberts(a)redhat.com>
Gerrit-Reviewer: Kiril Nesenko <knesenko(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
11 years, 5 months