[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-3-ge7180f5

[Git repo owner]

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, 3.22.x has been updated
       via  e7180f557074f43236faa618e2d08d09ece2cb28 (commit)
       via  d8ba2e95c43f3ce0cc66f0900288cf99e1f5bfc6 (commit)
      from  ea6c6f4155d457fe839f6097732219b07c7a9b9d (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 e7180f557074f43236faa618e2d08d09ece2cb28
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Mar 25 09:15:14 2016 +0100

    Bug 16084: [QA Follow-up] Correct three occurrences of __KOHA_CONF_DIR__
    
    This bug correctly inserts substitutions for this variable.
    Four occurrences will now be changed. The line for log4perl.conf is now
    correct, but the three other changes point to a location that does not
    exist: /etc/koha/sites/$instance/zebradb.
    That should just be: /etc/koha/zebradb.
    All three cases concern the explain files.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
    (cherry picked from commit aa369c80c15b1699ddb89794c04bf0c3c0451b91)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit d8ba2e95c43f3ce0cc66f0900288cf99e1f5bfc6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Mar 16 16:21:32 2016 -0300

    Bug 16084: log4perl.conf not properly set on packages
    
    - Run koha-create to create an instance or just fire kohadevbox:ansible
    => FAIL: Notice the instance's koha-conf.xml points to __KOHA_CONF_DIR__
             instead of /etc/koha/sites/kohadev/ on the log4perl entry.
    => FAIL: the /etc/koha/sites/kohadev/log4perl.conf contains __LOG_DIR__
             instead of /var/log/koha/kohadev/
    - Apply this patch and pick the koha-conf-site.xml.in and koha-create files
    - Create a new instance
    => SUCCESS: All placeholders are filled correctly.
    - Sign off
    
    Regards
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
    (cherry picked from commit 360cdea29559d84d1f82f0e1e102f18fc8475bb4)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 debian/scripts/koha-create             |    4 +++-
 debian/templates/koha-conf-site.xml.in |    8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository