[commits] Horde branch master updated. c2470697f91dfc3cc04edbcab1e0e2ce84ded90a

[Michael J. Rubinsky]

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

from: 35ddcfa640500a3af72d72ffc78741415d7e7498

7c5f1ac Ensure Host and Socket are not both provided in all adapters.
c247069 Bug #14547 Fix using different protocols for the same driver type.

Summary: http://github.com/horde/horde/compare/35ddcfa640500a3af72d72ffc78741415d7e7498...c2470697f91dfc3cc04edbcab1e0e2ce84ded90a

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

commit 7c5f1ac383efcbb65c12b8c83accf0f97398493b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Jan 14 12:26:37 2017 -0500

    Ensure Host and Socket are not both provided in all adapters.

 framework/Db/lib/Horde/Db/Adapter/Mysqli.php    | 4 ++++
 framework/Db/lib/Horde/Db/Adapter/Pdo/Pgsql.php | 4 ++++
 2 files changed, 8 insertions(+)

http://github.com/horde/horde/commit/7c5f1ac383efcbb65c12b8c83accf0f97398493b

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

commit c2470697f91dfc3cc04edbcab1e0e2ce84ded90a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Jan 14 12:44:38 2017 -0500

    Bug #14547 Fix using different protocols for the same driver type.
    
    When merging the base config for the SQL driver we must remove the
    inappropriate settings since they will both be present when the
    config arrays are merged.

 framework/Core/lib/Horde.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

http://github.com/horde/horde/commit/c2470697f91dfc3cc04edbcab1e0e2ce84ded90a