[koha-commits] main Koha release repository branch master updated. v3.18.00-187-g9db34fe
Git repo owner
gitmaster at git.koha-community.org
Sat Jan 17 14:36:30 CET 2015
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 9db34fe8758e6303246a3347d19f05edc2653a42 (commit)
via 0a1914963985ad5bb6a0aacb21348ec892f3e590 (commit)
via 752b6dce2ff27bcac57e927b5431f69b4061a1c8 (commit)
via 3b54dbabfe1d5828a543c38829a22390a7a198f2 (commit)
via 9820e40f5d44e3094e253ed9edbf6f45cd2b2c17 (commit)
via ed7221102fec439997ebba14e4f061dfd8e3808b (commit)
via adcabe6f8f1d9e3e106fafad4a42e4f22840d28c (commit)
from 124549b8abad24c5c506ab5962a75782067b2c9a (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 9db34fe8758e6303246a3347d19f05edc2653a42
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Thu Jan 15 14:42:00 2015 +1300
Bug 13571: followup to remove some now-unused options
The memcache parameters aren't used by anything (except C4::SQLHelper,
but that's a cancer on the face of the earth) anymore, so they can go.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0a1914963985ad5bb6a0aacb21348ec892f3e590
Author: Rochelle <Rochelle_healy at hotmail.com>
Date: Wed Jan 14 22:49:59 2015 +0000
Bug 13571: Koha-conf.xml.in has fallen out of sync with koha-conf.xml
To test:
1- Build new koha packages
2- Check that the conflist file contains the changes we have made
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 752b6dce2ff27bcac57e927b5431f69b4061a1c8
Author: Morag Hills <the.invinnysible.one at gmail.com>
Date: Tue Jan 13 21:16:53 2015 +0000
Bug 13570 - koha-conf.xml mentions win32
Issue existed in koha-conf.xml of /etc.
The following lines were removed from the file:
<!-- uncomment these lines and comment out the above if running on MSWin32 -->
<!--
<listen id="biblioserver" >tcp:localhost:9998/bibliosocket</listen>
<listen id="authorityserver" >tcp:localhost:9999/authoritysocket</listen>
-->
This section was located on lines 9, 10, 11, 12 and 13 of the koha-conf.xml file.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3b54dbabfe1d5828a543c38829a22390a7a198f2
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jan 12 09:35:51 2015 +0100
Bug 13554: t/Prices.t shouldn't depend on the DB
To reproduce:
- Stop your MySQL server:
$ sudo service mysql stop
- Run
$ prove t/Prices.t
=> FAIL: some tests fail because of mysql stopped
To test (MySQL still stopped)
- Apply the patch
- Run
$ prove t/Prices.t
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 9820e40f5d44e3094e253ed9edbf6f45cd2b2c17
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Jan 14 09:54:40 2015 +0100
Bug 13577: Add the utf8_unicode_ci COLLATE to all tables
Bug 11944 added the COLLATE=utf8_unicode_ci to all DB tables.
But some new tables have been created between the write of the patch set
and the push to master.
So these new tables don't have the correct collate.
Test plan:
0/ Reproduce the error:
mysql> create database koha_test CHARACTER SET utf8 COLLATE utf8_unicode_ci;
mysql koha_test < installer/data/mysql/kohastructure.sql
It will boom with:
ERROR 1005 (HY000) at line 3493: Can't create table `koha_test`.`items_search_fields`
(errno: 150 "Foreign key constraint is incorrectly formed")
1/ Apply the patch, destroy the DB and recreate it:
mysql> create database koha_test CHARACTER SET utf8 COLLATE utf8_unicode_ci;
mysql> drop database koha_test;
mysql koha_test < installer/data/mysql/kohastructure.sql
All tables should be inserted without any error.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ed7221102fec439997ebba14e4f061dfd8e3808b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Aug 28 17:03:32 2014 +0200
Bug 12845: C4::Output::FormatData can be removed
Test plan:
git grep FormatData
should not return any result in pl and pm files.
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit adcabe6f8f1d9e3e106fafad4a42e4f22840d28c
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Dec 4 16:27:04 2014 +0100
Bug 13393: Remove C4::VirtualShelves::Merge
This is empty (?)
Test plan:
git grep 'VirtualShelves::Merge'
should not return anything.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Output.pm | 16 +---------------
C4/VirtualShelves/Merge.pm | 5 -----
debian/templates/koha-conf-site.xml.in | 21 ++++++++++++++++++---
etc/koha-conf.xml | 5 -----
installer/data/mysql/kohastructure.sql | 8 ++++----
t/Prices.t | 16 +++++++++-------
t/VirtualShelves_Merge.t | 14 --------------
7 files changed, 32 insertions(+), 53 deletions(-)
delete mode 100644 C4/VirtualShelves/Merge.pm
delete mode 100755 t/VirtualShelves_Merge.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list