Change in ovirt-engine[master]: engine: fix error message merge conflict
Shahar Havivi has submitted this change and it was merged.
Change subject: engine: fix error message merge conflict
......................................................................
engine: fix error message merge conflict
Both patches: https://gerrit.ovirt.org/45365 and https://gerrit.ovirt.org/#/c/45390/
change the same message and override each other.
This patch fix it.
Change-Id: I479cde8186d1ab919231f411b2a3db73133531a7
Signed-off-by: Shahar Havivi <shaharh(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:
Shahar Havivi: Verified; Passed CI tests
Omer Frenkel: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/45426
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I479cde8186d1ab919231f411b2a3db73133531a7
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org