Change in ovirt-engine[master]: userportal, webadmin: BrandingManager fails with missing etcd...
Daniel Erez has submitted this change and it was merged.
Change subject: userportal,webadmin: BrandingManager fails with missing etcdir
......................................................................
userportal,webadmin: BrandingManager fails with missing etcdir
- BrandingManager.getInstance() would fail when you have a missing
etcDir configuration which is often the case in unit tests. This
patch stops the failure and instead returns no branding information.
Change-Id: Ifc34286323c1eda114f6a8b5570274faf53b566c
Signed-off-by: Alexander Wels <awels(a)redhat.com>
---
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingManager.java
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
Daniel Erez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/16046
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc34286323c1eda114f6a8b5570274faf53b566c
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com>
Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com>
Gerrit-Reviewer: Greg Sheremeta <gshereme(a)redhat.com>
Gerrit-Reviewer: Kiril Nesenko <knesenko(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server