Alona Kaplan has submitted this change and it was merged. Change subject: core: override configuration ...................................................................... core: override configuration add 'overrideConfiguration' field so user can explicitely express his intention. Change-Id: I6e966a1cb51aee4743b0a40e4ea82d7f961e7bac Signed-off-by: Martin Mucha <mmucha@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkAttachmentValidator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidatorTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/NetworkAttachmentValidatorTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntityMap.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Entities.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkAttachment.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/MapNetworkAttachments.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/annotation/ValidNameOfVdsNetworkInterface.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties 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 15 files changed, 335 insertions(+), 116 deletions(-) Approvals: Alona Kaplan: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/37242 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e966a1cb51aee4743b0a40e4ea82d7f961e7bac Gerrit-PatchSet: 74 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <mmucha@redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Mucha <mmucha@redhat.com> Gerrit-Reviewer: Moti Asayag <masayag@redhat.com> Gerrit-Reviewer: automation@ovirt.org