[koha-commits] main Koha release repository branch master updated. v16.05.00-600-gd0d8bd1

[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, master has been updated
       via  d0d8bd18225483c3c28ba9e0bd368301c6835a66 (commit)
       via  cb72420b4672ec41ebaeb9a51b6387e6f8bb5313 (commit)
      from  77b03f1e8b2afe0e9063b06785a0eb468fb029ed (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 d0d8bd18225483c3c28ba9e0bd368301c6835a66
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>

commit cb72420b4672ec41ebaeb9a51b6387e6f8bb5313
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>

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

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