This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 19.11.x has been updated
via a2e8131dc2bd1e9b38e836744e0fc0fa67ebf6ce (commit)
via df41ff4a9c54c0e958bbdb49acec671c024ec29e (commit)
from e78231f3f63ed49fc65ac653e57159a8aba7fbe2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a2e8131dc2bd1e9b38e836744e0fc0fa67ebf6ce
Author: David Cook <dcook at prosentient.com.au>
Date: Mon May 18 07:08:18 2020 +0000
Bug 25524: Remove --line-regexp option in log4perl_component()
The current grep expression uses -x|--line-regexp, but that causes
the regexp to fail to match since we're not specifying a regexp
that can match a whole line. We can either provide a better regexp,
or remove that --line-regexp option.
This patch removes the --line-regexp (ie -x) option from the grep
in log4perl_component, so that it detects logger components correctly.
To Test:
0) Apply patch
1) Build Koha package
2) Look at /etc/koha/sites/kohadev/log4perl.conf in an existing
Koha instance (e.g. on koha-testing-docker), and note it has
components for z3950, api, and sip
3) Install package
4) Note that /etc/koha/sites/kohadev/log4perl.conf is the same as before
5) Remove the "log4perl.logger.sip and log4perl.appender.SIP lines from
/etc/koha/sites/kohadev/log4perl.conf
6) Reinstall package
7) Note that the missing lines have been appended to the file at
/etc/koha/sites/kohadev/log4perl.conf
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit df41ff4a9c54c0e958bbdb49acec671c024ec29e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon May 18 14:14:42 2020 -0400
Bug 25535: Hold API mapping maps cancellationdate to cancelation_date, but it should be cancellation_date
Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Hold.pm | 2 +-
api/v1/swagger/definitions/hold.json | 2 +-
api/v1/swagger/paths/holds.json | 2 +-
debian/koha-common.postinst | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
main Koha release repository