[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-2-g065816d

[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.10.x has been updated
       via  065816de92d40f6f8f597b236bc3f118afcd1911 (commit)
       via  e27da4a9b5e0ae41885e93240bf2e2a025f4e4e5 (commit)
      from  a3649cf28de5979c872327203e2e37669c5d4ae3 (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 065816de92d40f6f8f597b236bc3f118afcd1911
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Sat Nov 10 07:51:22 2012 -0500

    Bug 9049: Don't use shadow with rebuild_zebra -r
    
    Due to a limitation of Zebra, the register must be cleared *before*
    doing shadow indexing if you want to reset the indexes. In light of
    that, it does not make sense to do shadow indexing at all when
    rebuild_zebra.pl is run with the -r switch. This patch makes -r (reset)
    imply -n (no shadow).
    
    To test:
    1) Run `rebuild_zebra.pl -b -r -v -v -v`
    2) Note that the script never runs the merge phase
    
    Without the patch I see log lines refering to the shadow cache (enabling shadow spec=/home/koha/koha-dev/var/lib/zebradb/biblios/shadow:20G)
    With the patch I don't see anything in the logs about shadow.  I do however see lines about merging.  I think it could just be a misunderstanding of the logs
    
    Signed-off-by: wajasu <matted-34813 at mypacks.net>
    Signed-off-by: Elliott Davis <elliott at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit e27da4a9b5e0ae41885e93240bf2e2a025f4e4e5
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Aug 22 13:37:31 2012 +0200

    Bug 7358: reaffect a closed basket to a closed basketgroup
    
    The list of basketgroups when looking at a closed basket show all the
    basketgroups.
    It should not be possible to affect a basket to a closed basketgroup,
    since this basketgroup should have been sent to a supplier.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 acqui/basket.pl                                    |    4 +-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   48 +++++++++++++-------
 misc/migration_tools/rebuild_zebra.pl              |    6 ++-
 3 files changed, 39 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
main Koha release repository