[commits] Horde branch master updated. acf938e13b441ba702608eb87c2a528f6fb085b5

[Michael J. Rubinsky]

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

from: 25d904d407aab4fcce3592ce16200804a2de86d1

acf938e revert d9ddb35544761401ccd4fb246f0d54730de82b16 and 25d904d407aab4fcce3592ce16200804a2de86d1

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

commit acf938e13b441ba702608eb87c2a528f6fb085b5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Jun 12 12:32:02 2011 -0400

    revert d9ddb35544761401ccd4fb246f0d54730de82b16 and 25d904d407aab4fcce3592ce16200804a2de86d1
    
    This was a logic error. Transaction ids might be associated with multiple timestamps,
    so we might still have duplicate keys. Check for this before insert.

 whups/migration/6_whups_upgrade_transactions.php |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

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