[commits] Horde branch master updated. 74e214448a7c9f3f73f1490494b508ef7a918a6a

[Michael Rubinsky]

The branch "master" has been updated.
The following is a summary of the commits.

from: c18394186255f74e2ad120459156103275f52e6a

f749d84 fix member name
b1bf8f7 fix parse error
74e2144 Consistenly allow setting prefix for cache entries.

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

commit f749d844df3d02dc5971aa17f336532ba1d8862f
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Sun Jun 13 12:36:28 2010 -0400

    fix member name

 framework/Cache/lib/Horde/Cache/File.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/framework/Cache/lib/Horde/Cache/File.php?rt=horde-git&r1=40e6e5beecbd4b69b590afaecbde1adf662ea3dc&r2=f749d844df3d02dc5971aa17f336532ba1d8862f

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

commit b1bf8f716b5612012fb2023aac6be8d7facd139c
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Sun Jun 13 12:46:22 2010 -0400

    fix parse error

 framework/Cache/lib/Horde/Cache/Sql.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/framework/Cache/lib/Horde/Cache/Sql.php?rt=horde-git&r1=1ed41f6721afe6cf43bd54c58ab8252d0346ac65&r2=b1bf8f716b5612012fb2023aac6be8d7facd139c

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

commit 74e214448a7c9f3f73f1490494b508ef7a918a6a
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Sun Jun 13 13:12:50 2010 -0400

    Consistenly allow setting prefix for cache entries.
    
    For drivers where this makes sense, always allow setting a cache entry prefix
    for preventing entry collisions from multiple horde instances on the same
    physical box and for forcing the use of a certain prefix, regardless of the
    servername we are hitting from. (This last point fixes an issue where a cache entry would
    not expire when the entry was cached while accessing horde's data via the api from
    a different virtual server).

 framework/Cache/lib/Horde/Cache/Apc.php          |    5 +
 framework/Cache/lib/Horde/Cache/Base.php         |    5 +
 framework/Cache/lib/Horde/Cache/Eaccelerator.php |    5 +
 framework/Cache/lib/Horde/Cache/File.php         |   32 ++----
 framework/Cache/lib/Horde/Cache/Memcache.php     |    7 +
 framework/Cache/lib/Horde/Cache/Xcache.php       |   22 +----
 framework/Cache/lib/Horde/Cache/Zps4.php         |    4 +
 horde/config/conf.php.mine                       |  133 ++++++++++++++++++++++
 horde/config/conf.xml                            |   32 +++++-
 9 files changed, 197 insertions(+), 48 deletions(-)
 create mode 100644 horde/config/conf.php.mine

http://git.horde.org/diff.php/framework/Cache/lib/Horde/Cache/Apc.php?rt=horde-git&r1=898136f146cabf99f63c7b29ff6b407f9747ed49&r2=74e214448a7c9f3f73f1490494b508ef7a918a6a
http://git.horde.org/diff.php/framework/Cache/lib/Horde/Cache/Base.php?rt=horde-git&r1=40e6e5beecbd4b69b590afaecbde1adf662ea3dc&r2=74e214448a7c9f3f73f1490494b508ef7a918a6a
http://git.horde.org/diff.php/framework/Cache/lib/Horde/Cache/Eaccelerator.php?rt=horde-git&r1=40e6e5beecbd4b69b590afaecbde1adf662ea3dc&r2=74e214448a7c9f3f73f1490494b508ef7a918a6a
http://git.horde.org/diff.php/framework/Cache/lib/Horde/Cache/File.php?rt=horde-git&r1=f749d844df3d02dc5971aa17f336532ba1d8862f&r2=74e214448a7c9f3f73f1490494b508ef7a918a6a
http://git.horde.org/diff.php/framework/Cache/lib/Horde/Cache/Memcache.php?rt=horde-git&r1=bf0a9465f22377499ab631ebc0c381a343400e1a&r2=74e214448a7c9f3f73f1490494b508ef7a918a6a
http://git.horde.org/diff.php/framework/Cache/lib/Horde/Cache/Xcache.php?rt=horde-git&r1=c18394186255f74e2ad120459156103275f52e6a&r2=74e214448a7c9f3f73f1490494b508ef7a918a6a
http://git.horde.org/diff.php/framework/Cache/lib/Horde/Cache/Zps4.php?rt=horde-git&r1=898136f146cabf99f63c7b29ff6b407f9747ed49&r2=74e214448a7c9f3f73f1490494b508ef7a918a6a
http://git.horde.org/co.php/horde/config/conf.php.mine?rt=horde-git&r=74e214448a7c9f3f73f1490494b508ef7a918a6a
http://git.horde.org/diff.php/horde/config/conf.xml?rt=horde-git&r1=9cb448eaeffa8c43e2a6256d57a425b66ce6220c&r2=74e214448a7c9f3f73f1490494b508ef7a918a6a