Change in ovirt-engine[ovirt-engine-3.6]: core userportal webadmin: Typo fix
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: core userportal webadmin: Typo fix
......................................................................
core userportal webadmin: Typo fix
While deleting cluster with host associated to it:
'Host Cluster contains one or more Hosts' -> 'Cluster contains one or
more Hosts'.
Change-Id: I9da686e10767ef0a9b6835a5d553c967bd52e9db
Bug-Url: https://bugzilla.redhat.com/1149468
Signed-off-by: Jakub Niedermertl <jniederm(a)redhat.com>
---
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Tomas Jelinek: Looks good to me, approved
Jakub Niedermertl: Verified
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/46969
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9da686e10767ef0a9b6835a5d553c967bd52e9db
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Jakub Niedermertl <jniederm(a)redhat.com>
Gerrit-Reviewer: Jakub Niedermertl <jniederm(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 3 months
Change in ovirt-hosted-engine-setup[master]: packaging: spec: ovirt 4.0.0 updates
by sbonazzo＠redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: packaging: spec: ovirt 4.0.0 updates
......................................................................
packaging: spec: ovirt 4.0.0 updates
- dropped el6 legacy code
- require new SDK
- aligned glusterfs-cli with server version
Change-Id: I0b53e669259ba2d373db96760cf3f6af039540f1
Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com>
---
M ovirt-hosted-engine-setup.spec.in
1 file changed, 5 insertions(+), 8 deletions(-)
Approvals:
Sandro Bonazzola: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/46951
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b53e669259ba2d373db96760cf3f6af039540f1
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-hosted-engine-setup
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Rafael Martins <rmartins(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 3 months
Change in ovirt-engine[master]: packaging: Add NSS_DB_DIR FileLocation
by sbonazzo＠redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: packaging: Add NSS_DB_DIR FileLocation
......................................................................
packaging: Add NSS_DB_DIR FileLocation
Change-Id: I44b87598f5bef28ceb1671068bbac79924437550
Signed-off-by: Lev Veyde <lveyde(a)redhat.com>
Bug-Url: https://bugzilla.redhat.com/902979
---
M packaging/setup/ovirt_engine_setup/engine/constants.py
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Sandro Bonazzola: Verified; Looks good to me, approved; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/46675
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I44b87598f5bef28ceb1671068bbac79924437550
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lev Veyde <lveyde(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 3 months
Change in ovirt-hosted-engine-ha[master]: Fix an unintended integer to tuple conversion
by msivak＠redhat.com
Martin Sivák has submitted this change and it was merged.
Change subject: Fix an unintended integer to tuple conversion
......................................................................
Fix an unintended integer to tuple conversion
This was breaking the memory based penalization logic. Just a little
extra comma...
Change-Id: Iebfff661545f710aaa9b3cf72c6cda9a0645a0c5
Signed-off-by: Martin Sivak <msivak(a)redhat.com>
---
M ovirt_hosted_engine_ha/agent/state_machine.py
M ovirt_hosted_engine_ha/agent/states.py
2 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
Sandro Bonazzola: Looks good to me, but someone else must approve
Martin Sivák: Verified; Looks good to me, approved
Simone Tiraboschi: Looks good to me, but someone else must approve
Roman Mohr: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/46974
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iebfff661545f710aaa9b3cf72c6cda9a0645a0c5
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-hosted-engine-ha
Gerrit-Branch: master
Gerrit-Owner: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 3 months
Change in ovirt-engine[master]: core userportal webadmin: Typo fix
by tjelinek＠redhat.com
Tomas Jelinek has submitted this change and it was merged.
Change subject: core userportal webadmin: Typo fix
......................................................................
core userportal webadmin: Typo fix
While deleting cluster with host associated to it:
'Host Cluster contains one or more Hosts' -> 'Cluster contains one or
more Hosts'.
Change-Id: I9da686e10767ef0a9b6835a5d553c967bd52e9db
Bug-Url: https://bugzilla.redhat.com/1149468
Signed-off-by: Jakub Niedermertl <jniederm(a)redhat.com>
---
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Tomas Jelinek: Looks good to me, approved
Jakub Niedermertl: Verified
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/46968
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9da686e10767ef0a9b6835a5d553c967bd52e9db
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Jakub Niedermertl <jniederm(a)redhat.com>
Gerrit-Reviewer: Jakub Niedermertl <jniederm(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 3 months
Change in ovirt-hosted-engine-setup[master]: packaging: setup: do not accept '_' character in FQDN
by sbonazzo＠redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: packaging: setup: do not accept '_' character in FQDN
......................................................................
packaging: setup: do not accept '_' character in FQDN
Synced with ovirt-engine. Can't use \w metacharacter because it matches
'_' character.
Change-Id: I28d240c4be8e8b84aebeb25fdbc8afc6e8f5d828
Bug-Url: https://bugzilla.redhat.com/1221176
Signed-off-by: Rafael Martins <rmartins(a)redhat.com>
---
M src/plugins/ovirt-hosted-engine-setup/engine/fqdn.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Sandro Bonazzola: Looks good to me, approved
Simone Tiraboschi: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Rafael Martins: Verified
--
To view, visit https://gerrit.ovirt.org/46823
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28d240c4be8e8b84aebeb25fdbc8afc6e8f5d828
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-hosted-engine-setup
Gerrit-Branch: master
Gerrit-Owner: Rafael Martins <rmartins(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Rafael Martins <rmartins(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 3 months
Change in ovirt-engine[master]: automation: lower build memory requirements
by sbonazzo＠redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: automation: lower build memory requirements
......................................................................
automation: lower build memory requirements
with -Xmx6G and 2 workers Jenkins VMs ran out of memory.
Reduced to 4G and 1 worker.
Change-Id: Ia25f5b45620e4d64601fa826e2cf15b2d34bf883
Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com>
---
M automation/build-artifacts.sh
M automation/check-merged.sh
M automation/check-patch.sh
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Sandro Bonazzola: Verified; Looks good to me, approved; Passed CI tests
Juan Hernandez: Looks good to me, but someone else must approve
Vojtech Szocs: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/46946
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia25f5b45620e4d64601fa826e2cf15b2d34bf883
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Greg Sheremeta <gshereme(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 3 months
Change in ovirt-hosted-engine-setup[master]: packaging: bumped gettext to 0.18.2
by sbonazzo＠redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: packaging: bumped gettext to 0.18.2
......................................................................
packaging: bumped gettext to 0.18.2
- EL7 provides 0.18.2.1
- Solved:
/usr/bin/xgettext: warning: The option --msgid-bugs-address
was not specified.
If you are using a 'Makevars' file, please specify
the MSGID_BUGS_ADDRESS variable there; otherwise please
specify an --msgid-bugs-address command line option.
- Solved:
autoreconf: running: automake --add-missing --copy --force-missing
configure.ac:39: warning: The 'AM_PROG_MKDIR_P' macro is
deprecated, and its use is discouraged.
configure.ac:39: You should use the Autoconf-provided
'AC_PROG_MKDIR_P' macro instead,
configure.ac:39: and use '$(MKDIR_P)' instead of
'$(mkdir_p)'in your Makefile.am files.
- ignore autogenerated intl directory
Change-Id: Idba3f339468a9a5dadccaae6664142f1e09ec935
Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com>
---
M .gitignore
M configure.ac
M ovirt-hosted-engine-setup.spec.in
M po/Makevars
M po/POTFILES.in
5 files changed, 59 insertions(+), 4 deletions(-)
Approvals:
Sandro Bonazzola: Verified; Looks good to me, approved
Simone Tiraboschi: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/46942
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idba3f339468a9a5dadccaae6664142f1e09ec935
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-hosted-engine-setup
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: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 3 months
Change in ovirt-engine[master]: restapi: Rename "CdRom" to "Cdrom"
by juan.hernandez＠redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: restapi: Rename "CdRom" to "Cdrom"
......................................................................
restapi: Rename "CdRom" to "Cdrom"
This is to increase the consistency between the names of the complex
types and the names of the elements. In this case the name of the
element is "cdrom", a single word, and it is better for backwards
compatibility to change the name of the type than to change the name of
the element.
Change-Id: Ifb642144312401688a4ceec3749223a44fdd53ea
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
---
M backend/manager/modules/restapi/README.md
M backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/LinkHelperTest.java
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/CdRomResource.java
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/SnapshotCdRomResource.java
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/SnapshotCdRomsResource.java
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplateResource.java
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmResource.java
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java
M backend/manager/modules/restapi/interface/definition/src/main/schema/api.xsd
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCdRomResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCdRomsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyCdRomsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotCdRomResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotCdRomsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCdRomsResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCdRomResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCdRomsResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyCdRomResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/CdRomMapper.java
M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/CdRomMapperTest.java
24 files changed, 139 insertions(+), 138 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/46935
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb642144312401688a4ceec3749223a44fdd53ea
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 3 months
Change in ovirt-engine[master]: restapi: Rename "WatchDog" to "Watchdog"
by juan.hernandez＠redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: restapi: Rename "WatchDog" to "Watchdog"
......................................................................
restapi: Rename "WatchDog" to "Watchdog"
This is to increase the consistency between the names of the complex
types and the names of the elements. In this case the name of the
element is "watchdog", a single word, and it is better for backwards
compatibility to change the name of the type than to change the name of
the element.
Change-Id: I0f72725680fe849fed4b6a336c32d9fe6766b3ee
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
---
M backend/manager/modules/restapi/README.md
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/WatchdogResource.java
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/WatchdogsResource.java
M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java
M backend/manager/modules/restapi/interface/definition/src/main/schema/api.xsd
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/WatchdogValidator.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendWatchdogsResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/validation/WatchdogValidatorTest.java
M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogMapper.java
M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/WatchdogMapperTest.java
15 files changed, 74 insertions(+), 72 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/46933
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f72725680fe849fed4b6a336c32d9fe6766b3ee
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
9 years, 3 months