Change in ovirt-engine[ovirt-engine-4.0]: Adding JsonProperty to fix parsing of foreman entities
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: Adding JsonProperty to fix parsing of foreman entities
......................................................................
Adding JsonProperty to fix parsing of foreman entities
For every two or more words field we need explicitly to describe its json name.
In engine the style convention is to use capital latter between words. The
json schema separates words with underscore.
This code used to work before with older jackson package, currently its
mandatory to work properly.
Change-Id: Ie6ca2db5ab081fa2db0df868e962b205202915dd
Bug-Url: https://bugzilla.redhat.com/1348916
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
(cherry picked from commit 52c675cd4c7013a900c6060074160e92dc246a70)
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanDiscoveredHost.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanError.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostGroup.java
3 files changed, 22 insertions(+), 3 deletions(-)
Approvals:
Yaniv Bronhaim: Verified; Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Oved Ourfali: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/59615
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6ca2db5ab081fa2db0df868e962b205202915dd
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years
Change in ovirt-engine[ovirt-engine-4.0]: core: prevent removal of all images of prestarted stateless vm
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: core: prevent removal of all images of prestarted stateless vm
......................................................................
core: prevent removal of all images of prestarted stateless vm
When prestarted VM shuts down two threads might try to remove its
stateless snapshot:
1. Pool's monitoring that automatically starts prestarted VMs
2. VMs monitoring
If the pool's monitoring is triggered before VMs monitoring we might
get into a race that leads to removal of all images of a prestarted
stateless VM:
Thread 1 - PoolMonitoring calls RunVm that calls ProceedDownVm which
calls RestoreStatelessVm that in turn calls RestoreAllSnapshots
Thread 2 - VmsMonitoring calls ProceedDownVm that in turn calls
RestoreStatelessVm that also calls RestoreAllSnapshots
In thread 1 an exclusive lock is taken for the VM by RunVm and this
lock is passed all the way through to RestoreStatelessVm. This in
turn calls UpdateVmVersion that most of the time fails to run with
its lock and therefore the lock is released. But the instance of the
lock is still passed to RestoreAllSnapshots which basically means
that this command is executed with no lock on the VM.
Then, the second call to RestoreAllSnapshots by thread 2 might also
try to remove the latest images of the disks, after the ones from
the stateless snapshots had been removed -> so the images attached
to the active snapshot is removed as well.
The solution is not to pass the lock to UpdateVmVersion. This change
is safe since the lock was anyway released at the end of the execute
phase of UpdateVmVersion.
Change-Id: I870ef6757418205599e97688a276c75097642456
Bug-Url: https://bugzilla.redhat.com/1346270
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreStatelessVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/UpdateVmVersionParameters.java
3 files changed, 19 insertions(+), 4 deletions(-)
Approvals:
Shahar Havivi: Looks good to me, approved
Jenkins CI: Passed CI tests
Arik Hadas: Verified
--
To view, visit https://gerrit.ovirt.org/59689
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I870ef6757418205599e97688a276c75097642456
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years
Change in ovirt-engine[ovirt-engine-4.0]: webadmin, userportal: translations update from zanata
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: webadmin, userportal: translations update from zanata
......................................................................
webadmin, userportal: translations update from zanata
Refreshed translations from oVirt's zanata project, version master.
The following locales were updated:
de_DE,
es_ES,
fr_FR,
it_IT,
ja_JP,
ko_KR,
pt_BR,
zh_CN
Change-Id: I543ae530472b4c52f3fe1d26dda288b86140cc07
Bug-Url: https://bugzilla.redhat.com/1348278
Signed-off-by: Scott J Dickerson <sdickers(a)redhat.com>
---
A backend/manager/modules/enginesso/src/main/resources/AppMessages_de_DE.properties
A backend/manager/modules/enginesso/src/main/resources/AppMessages_es_ES.properties
A backend/manager/modules/enginesso/src/main/resources/AppMessages_fr_FR.properties
A backend/manager/modules/enginesso/src/main/resources/AppMessages_it_IT.properties
A backend/manager/modules/enginesso/src/main/resources/AppMessages_ja_JP.properties
A backend/manager/modules/enginesso/src/main/resources/AppMessages_ko_KR.properties
A backend/manager/modules/enginesso/src/main/resources/AppMessages_pt_BR.properties
A backend/manager/modules/enginesso/src/main/resources/AppMessages_zh_CN.properties
A backend/manager/modules/enginesso/src/main/resources/messages_de_DE.properties
A backend/manager/modules/enginesso/src/main/resources/messages_es_ES.properties
A backend/manager/modules/enginesso/src/main/resources/messages_fr_FR.properties
A backend/manager/modules/enginesso/src/main/resources/messages_it_IT.properties
A backend/manager/modules/enginesso/src/main/resources/messages_ja_JP.properties
A backend/manager/modules/enginesso/src/main/resources/messages_ko_KR.properties
A backend/manager/modules/enginesso/src/main/resources/messages_pt_BR.properties
A backend/manager/modules/enginesso/src/main/resources/messages_zh_CN.properties
M backend/manager/modules/welcome/src/main/resources/messages_de_DE.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_de_DE.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_es_ES.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_fr_FR.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_it_IT.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_ko_KR.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_pt_BR.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_zh_CN.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationMessages_de_DE.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationMessages_es_ES.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationMessages_fr_FR.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationMessages_it_IT.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationMessages_ko_KR.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationMessages_zh_CN.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums_de_DE.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums_es_ES.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums_fr_FR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums_it_IT.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums_ko_KR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums_pt_BR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums_zh_CN.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_de_DE.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_es_ES.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_fr_FR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_it_IT.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_ko_KR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_pt_BR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_zh_CN.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIMessages_de_DE.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIMessages_es_ES.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIMessages_fr_FR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIMessages_it_IT.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIMessages_ko_KR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIMessages_zh_CN.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_de_DE.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_es_ES.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_fr_FR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_it_IT.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_ja_JP.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_ko_KR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_pt_BR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_zh_CN.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/ApplicationConstants_de_DE.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/ApplicationConstants_es_ES.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/ApplicationConstants_fr_FR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/ApplicationConstants_it_IT.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/ApplicationConstants_ko_KR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/ApplicationConstants_zh_CN.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_it_IT.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_de_DE.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_es_ES.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_fr_FR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_it_IT.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_ja_JP.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_ko_KR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_pt_BR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_zh_CN.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants_de_DE.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants_es_ES.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants_fr_FR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants_ko_KR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants_pt_BR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants_zh_CN.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationMessages_de_DE.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationMessages_es_ES.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationMessages_fr_FR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationMessages_it_IT.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationMessages_ja_JP.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationMessages_ko_KR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationMessages_zh_CN.properties
100 files changed, 3,359 insertions(+), 200 deletions(-)
Approvals:
Alexander Wels: Looks good to me, approved
Jenkins CI: Passed CI tests
Scott Dickerson: Verified
--
To view, visit https://gerrit.ovirt.org/59657
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I543ae530472b4c52f3fe1d26dda288b86140cc07
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Scott Dickerson <sdickers(a)redhat.com>
Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Greg Sheremeta <gshereme(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Scott Dickerson <sdickers(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years
Change in ovirt-engine[ovirt-engine-4.0]: engine: Snmp protocols should be read according to security ...
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: engine: Snmp protocols should be read according to security level
......................................................................
engine: Snmp protocols should be read according to security level
SNMP_AUTH_PROTOCOL should only be read
for security levels 2 and 3.
SNMP_PRIVACY_PROTOCOL should only be read
for security level 3.
Change-Id: Ia529e544a4aead5dcae6dd9197745674e99c443a
Bug-Url: https://bugzilla.redhat.com/1268133
Signed-off-by: Ravi Nori <rnori(a)redhat.com>
(cherry picked from commit d368ebe49ace51b0f6b7c432dde3dd64fbddbee0)
---
M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/snmp/Snmp.java
1 file changed, 10 insertions(+), 5 deletions(-)
Approvals:
Martin Peřina: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/59666
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia529e544a4aead5dcae6dd9197745674e99c443a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Martin Peřina <mperina(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Ravi Nori <rnori(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years
Change in ovirt-engine[ovirt-engine-3.6]: ovirt-engine-notifier : Add support for SNMPv3 traps
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: ovirt-engine-notifier : Add support for SNMPv3 traps
......................................................................
ovirt-engine-notifier : Add support for SNMPv3 traps
Add support to send SNMPv3 traps
from ovirt-engine-notification service.
New config variables SNMP_VERSION, SNMP_ENGINE_ID,
SNMP_USERNAME, SNMP_AUTH_PASSPHRASE,
SNMP_PRIVACY_PASSPHRASE, SNMP_SECURITY_LEVEL,
SNMP_AUTH_PROTOCOL and SNMP_PRIVACY_PROTOCOL
can be configured to send SNMPv3 traps.
net-snmp supports MD5 and SHA auth protocols
and AES128 privacy protocol.
Change-Id: I5a47f16eaf1d5461f223d514383a26f5696ba255
Bug-Url: https://bugzilla.redhat.com/1348933
Signed-off-by: Ravi Nori <rnori(a)redhat.com>
---
M backend/manager/dependencies/common/src/main/modules/org/snmp4j/main/module.xml
M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/snmp/Snmp.java
M backend/manager/tools/src/test/java/org/ovirt/engine/core/notifier/transport/snmp/ProfileTest.java
M packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf.in
4 files changed, 297 insertions(+), 61 deletions(-)
Approvals:
Martin Peřina: Looks good to me, approved
Ravi Nori: Verified
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/59651
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a47f16eaf1d5461f223d514383a26f5696ba255
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Ravi Nori <rnori(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Ravi Nori <rnori(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years
Change in ovirt-engine[ovirt-engine-3.6]: restapi: Don't ignore All-Content header in VirtOnly mode
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: restapi: Don't ignore All-Content header in VirtOnly mode
......................................................................
restapi: Don't ignore All-Content header in VirtOnly mode
Currently when the value of the "ApplicationMode" configuration value is
"VirtOnly" the "All-Content" header is ignored by the clusters resource.
This patch fixes that issue.
Change-Id: Ib049ca38fc245772cda12e387031371c39452dad
Bug-Url: https://bugzilla.redhat.com/1346247
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit 0f3f526d2d953c6e94efa77beb415bc80bc95d5d)
(cherry picked from commit 5de803b65e4e962da17946647e19b2caf7459bad)
---
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/59515
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib049ca38fc245772cda12e387031371c39452dad
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years
Change in ovirt-guest-agent[master]: build: Including Windows SSO plugins in build now
by vfeenstr＠redhat.com
Vinzenz Feenstra has submitted this change and it was merged.
Change subject: build: Including Windows SSO plugins in build now
......................................................................
build: Including Windows SSO plugins in build now
Change-Id: Id2e0c4e41d3dd0b128df4dd1617684a9b64cd491
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
---
M ovirt-guest-agent-windows.spec
1 file changed, 17 insertions(+), 0 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Vinzenz Feenstra: Verified; Looks good to me, approved
Milan Zamazal: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/59671
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2e0c4e41d3dd0b128df4dd1617684a9b64cd491
Gerrit-PatchSet: 6
Gerrit-Project: ovirt-guest-agent
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years
Change in ovirt-engine[master]: webadmin: Propagate 'Disable smartcard' to console.vv
by tjelinek＠redhat.com
Tomas Jelinek has submitted this change and it was merged.
Change subject: webadmin: Propagate 'Disable smartcard' to console.vv
......................................................................
webadmin: Propagate 'Disable smartcard' to console.vv
The user can override 'Enable smartcard' from Edit VM dialog
by 'Disable smartcard' in Console Options dialog.
The checkbox 'Disable smartcard' was not taken into account
when the console.vv is generated.
This patch provides fix.
Change-Id: If4d291f1fa4595e9f0bdbcddc16c0137a08f2248
Bug-Url: https://bugzilla.redhat.com/1349368
Signed-off-by: Marek Libra <mlibra(a)redhat.com>
---
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/console/ConsoleDescriptorGenerator.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Tomas Jelinek: Looks good to me, approved
Jenkins CI: Passed CI tests
Marek Libra: Verified
Arik Hadas: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/59683
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4d291f1fa4595e9f0bdbcddc16c0137a08f2248
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Marek Libra <mlibra(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marek Libra <mlibra(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years
Change in jenkins[master]: vdsm-jsonrpc-java_standard: fix 4.0 build target
by sbonazzo＠redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: vdsm-jsonrpc-java_standard: fix 4.0 build target
......................................................................
vdsm-jsonrpc-java_standard: fix 4.0 build target
drop el6 and fc22 on 4.0 for vdsm-jsonrpc-java
added by mistake.
Change-Id: I5f23c2607c829e393c23afcadd95fd9e6dbf999d
Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com>
---
M jobs/confs/projects/vdsm-jsonrpc-java/vdsm-jsonrpc-java_standard.yaml
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Sandro Bonazzola: Verified; Looks good to me; Ready for merge
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/59728
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f23c2607c829e393c23afcadd95fd9e6dbf999d
Gerrit-PatchSet: 2
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years
Change in ovirt-guest-agent[master]: Adding Windows cross compilation compatibility
by vfeenstr＠redhat.com
Vinzenz Feenstra has submitted this change and it was merged.
Change subject: Adding Windows cross compilation compatibility
......................................................................
Adding Windows cross compilation compatibility
This patch introduces changes to the guest agent plugins to have the
ability to cross compile the plugins
Change-Id: I40f0c5d85a2ed2d322250271d2f8d75f96b74598
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
---
M windows-credprov/Helpers.cpp
M windows-credprov/Helpers.h
M windows-credprov/Makefile.am
M windows-credprov/OVirtCredProv.cpp
M windows-credprov/OVirtCredentials.cpp
M windows-credprov/OVirtCredentials.h
M windows-credprov/OVirtProvider.h
M windows-credprov/Pch.h
A windows-credprov/README
A windows-credprov/credentialprovider.h
A windows-credprov/intsafe.h
11 files changed, 2,736 insertions(+), 3 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Vinzenz Feenstra: Verified; Looks good to me, approved
Yedidyah Bar David: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/26361
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40f0c5d85a2ed2d322250271d2f8d75f96b74598
Gerrit-PatchSet: 6
Gerrit-Project: ovirt-guest-agent
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenkins CI RO
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years