Yaniv Dary has submitted this change and it was merged.
Change subject: packaging: rebased to JRS CE 5.2
......................................................................
packaging: rebased to JRS CE 5.2
Change-Id: I837e1e99e40da1334fdc126ae410db1b24d3fed8
Signed-off-by: Yaniv Dary <ydary(a)redhat.com>
---
M Makefile
M packaging/common_utils.py
M packaging/default_master.properties
M packaging/ovirt-engine-reports-setup.py
M packaging/ovirt-engine-reports.spec.in
A packaging/z-ovirt-engine-reports-proxy.conf
M server-customizations/META-INF/MANIFEST.MF
D server-customizations/WEB-INF/applicationContext-logging.xml
M server-customizations/WEB-INF/applicationContext-security-web.xml
D server-customizations/WEB-INF/applicationContext-security.xml
M server-customizations/WEB-INF/applicationContext.xml
M server-customizations/WEB-INF/classes/jasperreports.properties
M server-customizations/WEB-INF/decorators/decorator.jsp
M server-customizations/WEB-INF/decorators/minimalDecorator.jsp
A server-customizations/WEB-INF/js.config.properties
D server-customizations/WEB-INF/jsp/modules/login/login.jsp
A server-customizations/WEB-INF/jsp/modules/login/loginHelp.jsp
M server-customizations/WEB-INF/log4j.properties
M server-customizations/WEB-INF/web.xml
19 files changed, 1,459 insertions(+), 1,378 deletions(-)
Approvals:
Yaniv Dary: Verified; Looks good to me, approved
--
To view, visit
http://gerrit.ovirt.org/19328
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I837e1e99e40da1334fdc126ae410db1b24d3fed8
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Yaniv Dary <ydary(a)redhat.com>
Gerrit-Reviewer: Yaniv Dary <ydary(a)redhat.com>