[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.10-21-gc423202

[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  c4232022753f7f64dd1c18cdc448536af608629a (commit)
       via  83fbc5a02aebebb04c376d580493535731075496 (commit)
      from  ffc137566346ac910fffd94556f4446e845581f6 (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 c4232022753f7f64dd1c18cdc448536af608629a
Author: Magnus Enger <magnus at libriotech.no>
Date:   Wed Aug 31 10:47:43 2016 +0200

    Bug 17228 - Make two versions of SIPconfig.xml identical
    
    Several bugs have made changes to etc/SIPconfig.xml but not
    updated debian/templates/SIPconfig.xml. This means that an admin
    using the Debian packages who enables SIP2 for a site and looks at
    /etc/koha/sites/<instance>/SIPconfig.xml will not see an up-to-date
    version of that file, with the risk of missing possible config
    opportunities.
    
    Since debian/templates/SIPconfig.xml contains no placeholders or
    other magic stuff related to the Debian packaging, this patch simply
    copies etc/SIPconfig.xml to debian/templates/SIPconfig.xml
    
    To test: diff etc/SIPconfig.xml debian/templates/SIPconfig.xml
    There should be no difference between the files
    
    Signed-off-by: Claire Gravely <claire_gravely at hotmail.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit d0d8bd18225483c3c28ba9e0bd368301c6835a66)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit 35133dabed2d8f929617ed002bdf9d88eb295300)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 83fbc5a02aebebb04c376d580493535731075496
Author: Magnus Enger <magnus at libriotech.no>
Date:   Wed Aug 31 10:45:32 2016 +0200

    Bug 17228 - Fix whitespace in etc/SIPconfig.xml
    
    Remove trailing whitespace and replace tabs with 4 spaces.
    
    Signed-off-by: Claire Gravely <claire_gravely at hotmail.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit cb72420b4672ec41ebaeb9a51b6387e6f8bb5313)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit d5ac9eb197527114a0d980db3e691884aea21ea8)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 debian/templates/SIPconfig.xml |   49 +++++++++++++++++++++++++---------------
 etc/SIPconfig.xml              |   36 ++++++++++++++---------------
 2 files changed, 49 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
main Koha release repository