[commits] Horde branch develop updated. 9861ececbc2efd4cb3d143d715c0df34e4ea3526
Jan Schneider
jan at horde.org
Mon Mar 5 17:42:11 UTC 2012
The branch "develop" has been updated.
The following is a summary of the commits.
from: 0326926d8359411b2e659c2a783bd6c67b3923bf
b8c6213 Fix parse error (Arjen de Korte, Bug #11048).
c3c127b [jan] Fix parsing composite phone fields (alexander.haensch at ipc.uni-tuebingen.de, Bug #11047).
ec034a4 [jan] Fix ignored argument for listFolders() in SQL driver.
780e248 Horde_Util::getTempFile() takes care of deleting the temp file.
78590c5 [jan] Fix double unlink() of temporary files.
977786e Simplify
6f01485 Fix argument defaults. Report non-existing directory.
c273806 Grab errors from STDERR.
46ee33b Fix errors and inconsistent behavior detected by unit tests.
9aca8b8 [jan] Fix inconsistent behavior of the different backend drivers.
9861ece Merge branch 'master' into develop
-----------------------------------------------------------------------
commit b8c6213c30afcd11c7095322d55f93c078ba4582
Author: Jan Schneider <jan at horde.org>
Date: Mon Mar 5 10:03:34 2012 +0100
Fix parse error (Arjen de Korte, Bug #11048).
horde/bin/horde-set-perms | 2 +-
horde/docs/CHANGES | 1 +
horde/package.xml | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/b8c6213c30afcd11c7095322d55f93c078ba4582
-----------------------------------------------------------------------
commit c3c127ba5e7a2b575a045caed07238ea9bcfb59a
Author: Jan Schneider <jan at horde.org>
Date: Mon Mar 5 10:25:06 2012 +0100
[jan] Fix parsing composite phone fields (alexander.haensch at ipc.uni-tuebingen.de, Bug #11047).
.../lib/Horde/Kolab/Format/Xml/Type/Composite/Phone.php | 4 ++--
framework/Kolab_Format/package.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/c3c127ba5e7a2b575a045caed07238ea9bcfb59a
-----------------------------------------------------------------------
commit ec034a4b5a279d8f6ff95d6cbf7c0a95f8df108e
Author: Jan Schneider <jan at horde.org>
Date: Fri Mar 2 20:17:23 2012 +0100
[jan] Fix ignored argument for listFolders() in SQL driver.
Conflicts:
framework/Vfs/package.xml
framework/Vfs/lib/Horde/Vfs/Sql.php | 5 +++++
framework/Vfs/package.xml | 2 ++
2 files changed, 7 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/ec034a4b5a279d8f6ff95d6cbf7c0a95f8df108e
-----------------------------------------------------------------------
commit 780e248829bb86fed879f36a465f0fc6f302fa36
Author: Jan Schneider <jan at horde.org>
Date: Fri Mar 2 11:54:04 2012 +0100
Horde_Util::getTempFile() takes care of deleting the temp file.
framework/Vfs/lib/Horde/Vfs/Base.php | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/780e248829bb86fed879f36a465f0fc6f302fa36
-----------------------------------------------------------------------
commit 78590c5519dbf4ec781f194156ed842a3b32fc3e
Author: Jan Schneider <jan at horde.org>
Date: Fri Mar 2 20:21:47 2012 +0100
[jan] Fix double unlink() of temporary files.
framework/Vfs/package.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/78590c5519dbf4ec781f194156ed842a3b32fc3e
-----------------------------------------------------------------------
commit 977786e13b544824b5b9d56fc43d315c1d3a4c83
Author: Jan Schneider <jan at horde.org>
Date: Mon Mar 5 17:53:14 2012 +0100
Simplify
framework/Vfs/lib/Horde/Vfs/Base.php | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/977786e13b544824b5b9d56fc43d315c1d3a4c83
-----------------------------------------------------------------------
commit 6f01485ccff758e10d2c6a5a1c48162bcc5cf4bd
Author: Jan Schneider <jan at horde.org>
Date: Mon Mar 5 17:54:03 2012 +0100
Fix argument defaults. Report non-existing directory.
framework/Vfs/lib/Horde/Vfs/File.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/6f01485ccff758e10d2c6a5a1c48162bcc5cf4bd
-----------------------------------------------------------------------
commit c27380634dd1c9707106c18ac6df8a678289ed73
Author: Jan Schneider <jan at horde.org>
Date: Mon Mar 5 17:56:45 2012 +0100
Grab errors from STDERR.
framework/Vfs/lib/Horde/Vfs/Ssh2.php | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/c27380634dd1c9707106c18ac6df8a678289ed73
-----------------------------------------------------------------------
commit 46ee33bd42130f1663d22240e7324614075e30dc
Author: Jan Schneider <jan at horde.org>
Date: Mon Mar 5 17:57:53 2012 +0100
Fix errors and inconsistent behavior detected by unit tests.
framework/Vfs/lib/Horde/Vfs/Ftp.php | 41 +++++++++++++++++++++++++----
framework/Vfs/lib/Horde/Vfs/Ssh2.php | 47 ++++++++++++++++++++++-----------
2 files changed, 66 insertions(+), 22 deletions(-)
http://git.horde.org/horde-git/-/commit/46ee33bd42130f1663d22240e7324614075e30dc
-----------------------------------------------------------------------
commit 9aca8b8539b46a640027e832d16c122b9471ad1c
Author: Jan Schneider <jan at horde.org>
Date: Mon Mar 5 18:01:06 2012 +0100
[jan] Fix inconsistent behavior of the different backend drivers.
framework/Vfs/package.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/9aca8b8539b46a640027e832d16c122b9471ad1c
-----------------------------------------------------------------------
commit 9861ececbc2efd4cb3d143d715c0df34e4ea3526
Merge: 0326926 9aca8b8
Author: Jan Schneider <jan at horde.org>
Date: Mon Mar 5 18:41:56 2012 +0100
Merge branch 'master' into develop
Conflicts:
framework/Vfs/lib/Horde/Vfs/Sql.php
framework/Vfs/lib/Horde/Vfs/Ssh2.php
framework/Vfs/package.xml
horde/package.xml
.../lib/Horde/Kolab/Format/Xml/Type/Composite/Phone.php | 4 +-
framework/Kolab_Format/package.xml | 4 +-
framework/Vfs/package.xml | 5 +-
horde/bin/horde-set-perms | 2 +-
horde/docs/CHANGES | 1 +
horde/package.xml | 17 ++++-
6 files changed, 22 insertions(+), 11 deletions(-)
http://git.horde.org/horde-git/-/commit/9861ececbc2efd4cb3d143d715c0df34e4ea3526
More information about the commits
mailing list