[commits] Horde branch master updated. 55e0f0e7f7a85d721ed9f97a69420986fdc014b8

[Jan Schneider]

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

from: 367e93deabbcea3be4e9e657a5442a51b2a24386

1ede3a0 [jan] Add unit tests.
a22d492 [jan] Fix retrieving information for permanent locks.
3534b7c [jan] Don't make lock non-permanent when resetting a permanent lock.
d4ba2f0 [jan] Deny exclusive lock if shared locks exist.
55e0f0e [jan] Fix retrieving lock list if permanent locks exist (piper at hrz.uni-marburg.de, Bug #12077).

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

commit 1ede3a0d7a1d891654ce4a23776a119eb2e0b264
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 1 16:26:53 2013 +0100

    [jan] Add unit tests.

 framework/Lock/package.xml                   |   24 +++-
 framework/Lock/test/Horde/Lock/AllTests.php  |    3 +
 framework/Lock/test/Horde/Lock/LockTest.php  |  218 ++++++++++++++++++++++++++
 framework/Lock/test/Horde/Lock/bootstrap.php |    3 +
 framework/Lock/test/Horde/Lock/phpunit.xml   |    1 +
 5 files changed, 244 insertions(+), 5 deletions(-)
 create mode 100644 framework/Lock/test/Horde/Lock/AllTests.php
 create mode 100644 framework/Lock/test/Horde/Lock/LockTest.php
 create mode 100644 framework/Lock/test/Horde/Lock/bootstrap.php
 create mode 100644 framework/Lock/test/Horde/Lock/phpunit.xml

http://git.horde.org/horde-git/-/commit/1ede3a0d7a1d891654ce4a23776a119eb2e0b264

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

commit a22d49234af5824edda39ce11a16390bc631d77f
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 1 16:31:57 2013 +0100

    [jan] Fix retrieving information for permanent locks.

 framework/Lock/lib/Horde/Lock/Sql.php |   12 +++++++-----
 framework/Lock/package.xml            |    2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/a22d49234af5824edda39ce11a16390bc631d77f

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

commit 3534b7c98793047798f66f8ba02f35fc8a8085c5
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 1 16:33:09 2013 +0100

    [jan] Don't make lock non-permanent when resetting a permanent lock.

 framework/Lock/lib/Horde/Lock/Sql.php |    4 ++--
 framework/Lock/package.xml            |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/3534b7c98793047798f66f8ba02f35fc8a8085c5

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

commit d4ba2f03837ecb4d2868010f2b72cc6b472aa2a3
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 1 16:33:49 2013 +0100

    [jan] Deny exclusive lock if shared locks exist.

 framework/Lock/lib/Horde/Lock/Sql.php |    8 +++++---
 framework/Lock/package.xml            |    2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/d4ba2f03837ecb4d2868010f2b72cc6b472aa2a3

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

commit 55e0f0e7f7a85d721ed9f97a69420986fdc014b8
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 1 16:35:26 2013 +0100

    [jan] Fix retrieving lock list if permanent locks exist (piper at hrz.uni-marburg.de, Bug #12077).

 framework/Lock/lib/Horde/Lock/Sql.php |    9 +++++----
 framework/Lock/package.xml            |    2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/55e0f0e7f7a85d721ed9f97a69420986fdc014b8