[koha-commits] main Koha release repository branch master updated. v16.05.00-1303-gb3f9232

[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  b3f9232b6acaa0db7eed520a22ca0b07271b27ae (commit)
      from  d041018394401a40cc541fd2ae1ea338b14da051 (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 b3f9232b6acaa0db7eed520a22ca0b07271b27ae
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Sep 8 10:26:34 2016 +0100

    Bug 17274: Display the place where the memcached is picked
    
    The memcached config can be read from ENV or koha-conf.xml
    In order to remove any ambiguity, let's inform the user which config is
    used.
    
    Test plan:
    1/ Define the memcached config in ENV and $KOHA_CONF
    => Go on about page, you should get a warning
    2/ Define the memcached config in ENV and not in $KOHA_CONF
    => Go on about page, you should get a warning
    3/ Do not defined the memcached config in ENV or $KOHA_CONF
    => Go on about page, you should get a warning
    4/ Define the memcached config in $KOHA_CONF and not in ENV
    => Go on about page, you should not get a warning, this is the expected
    config
    
    Followed test plan, works as expected.
    Signed-off-by: Marc <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer  <katrin.fischer at bsz-bw.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 about.pl                                         |   12 +++++++++++-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |   13 ++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository