[koha-commits] main Koha release repository branch 3.4.x updated. v3.04.03-37-g54abc8e

[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.4.x has been updated
       via  54abc8e5f3b7212c512456e2856d5ad878e3faf5 (commit)
       via  e871a3faf33a8c1468b5c4d0c036200bc2ff2249 (commit)
       via  7d99f048a43f2176545ae89b57e44c268f2ebea3 (commit)
       via  565ed0c6a4c19f79d8458527e78334206548ce3f (commit)
       via  c50c0a6718aac89a36336a91157fe8aad57c3b12 (commit)
      from  0e69ac52cf06fc7a4ffcb9d6ae93ab4c5f0121ed (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 54abc8e5f3b7212c512456e2856d5ad878e3faf5
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Thu Jul 21 17:32:09 2011 +1200

    Bug 6540 - [SIGNED-OFF] fix some command-line args issues
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit e7cf2223e06d9aea07f2dce6cd6481cbc2ae0d9d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e871a3faf33a8c1468b5c4d0c036200bc2ff2249
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Wed Jul 20 19:01:19 2011 +0200

    Bug 6540 - Add config file as command line option for koha-create
    
    Order of precedence for config options, from lowest to highest:
    
    1. The defaults set in koha-create itself
    2. /etc/koha/koha-sites.conf
    3. Config file specified with --configfile
    4. Individual options set with --marcflavor, --zebralang, --defaultsql
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit b66c860d5df65c185279741219b88bc08e7de524)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 7d99f048a43f2176545ae89b57e44c268f2ebea3
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Wed Jul 20 16:08:51 2011 +0200

    Bug 6540 - Add defaultsql command line option
    
    This will override the setting in /etc/koha/koha-sites.conf.
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit bddca6fbcfaabd9a541c1c9e1c537c377c2b783f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 565ed0c6a4c19f79d8458527e78334206548ce3f
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Mon Jul 18 15:35:27 2011 +0200

    Bug 6540 - Followup patch adding command line options
    
    This adds the --marcflavor and --zebralang commandline options, as
    well as short versions of all options.
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit c7bde297188dfd5275f53c448c33f225a849ce9b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c50c0a6718aac89a36336a91157fe8aad57c3b12
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Sat Jul 16 20:58:34 2011 +0200

    Bug 6540 - Make ZEBRA_MARC_FORMAT and ZEBRA_LANGUAGE configurable for koha-create
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit b7b36796f57a87a02ec0ed0195cbf8ae22159e3e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 debian/scripts/koha-create                         |   70 ++++++++++++++++----
 debian/templates/zebra-authorities-dom-site.cfg.in |    2 +-
 debian/templates/zebra-authorities-site.cfg.in     |    2 +-
 debian/templates/zebra-biblios-site.cfg.in         |    2 +-
 4 files changed, 61 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
main Koha release repository