Skip to content
Browse files

Lost edit in 'theirs' merge strategy

  • Loading branch information...
1 parent 5fcb9a4 commit c067354b7c43d8ce396f6922d4687373f9bec6a3 @timf committed
Showing with 0 additions and 3 deletions.
  1. +0 −3 src/main/java/org/dasein/persist/Transaction.java
View
3 src/main/java/org/dasein/persist/Transaction.java
@@ -147,9 +147,6 @@ private static void _clean(long warnMs, long maxMs) {
} else if (diff > warnMs) {
logger.warn("Transaction " + xaction.transactionId + " has been open for " + diff/1000L + " seconds.");
}
- if( diff > 600 ) {
- closing.add(xaction);
- }
}
}
}

0 comments on commit c067354

Please sign in to comment.
Something went wrong with that request. Please try again.