[commits] Horde branch activesync_2_9_0 updated. c4b11d22a95443e22cbe701582427811786ffe72

[Michael J. Rubinsky]

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

from: 6ea723dd8018362cf2a3d34aee3e263c031ff589

5b03611 Move common properties to base class.
d97801f Abstract out ::_loadState() and move ::loadState to base class.
2a4564b More places to catch connection errors.
c4b11d2 Move ::isConflit() to base class.

Summary: http://github.com/horde/horde/compare/6ea723dd8018362cf2a3d34aee3e263c031ff589...c4b11d22a95443e22cbe701582427811786ffe72

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

commit 5b03611bcf2a9f33f5a0d6baf59d86201764cefb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 19:04:00 2013 -0400

    Move common properties to base class.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php  |   14 +++++++++++++
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |   14 -------------
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php   |   14 -------------
 3 files changed, 14 insertions(+), 28 deletions(-)

http://github.com/horde/horde/commit/5b03611bcf2a9f33f5a0d6baf59d86201764cefb
http://git.horde.org/horde-git/-/commit/5b03611bcf2a9f33f5a0d6baf59d86201764cefb

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

commit d97801fbe814a5c36af0fd9445a28490042f7208
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 19:04:27 2013 -0400

    Abstract out ::_loadState() and move ::loadState to base class.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php  |   77 +++++++++++--
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |   55 +---------
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php   |   59 +---------
 3 files changed, 73 insertions(+), 118 deletions(-)

http://github.com/horde/horde/commit/d97801fbe814a5c36af0fd9445a28490042f7208
http://git.horde.org/horde-git/-/commit/d97801fbe814a5c36af0fd9445a28490042f7208

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

commit 2a4564be36f97d94a65402e27f2087bbe2e1d0f4
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 19:11:38 2013 -0400

    More places to catch connection errors.

 .../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php |   25 +++--
 1 files changed, 15 insertions(+), 10 deletions(-)

http://github.com/horde/horde/commit/2a4564be36f97d94a65402e27f2087bbe2e1d0f4
http://git.horde.org/horde-git/-/commit/2a4564be36f97d94a65402e27f2087bbe2e1d0f4

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

commit c4b11d22a95443e22cbe701582427811786ffe72
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 19:12:47 2013 -0400

    Move ::isConflit() to base class.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php  |   39 +++++++++----
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |   27 ---------
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php   |   27 ---------
 3 files changed, 27 insertions(+), 66 deletions(-)

http://github.com/horde/horde/commit/c4b11d22a95443e22cbe701582427811786ffe72
http://git.horde.org/horde-git/-/commit/c4b11d22a95443e22cbe701582427811786ffe72