accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Mon, 24 Feb 2014 16:41:20 GMT
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aa61a337
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aa61a337
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aa61a337

Branch: refs/heads/master
Commit: aa61a33798c855b937f5cbbb87bff6f2eb748d50
Parents: a74f392 ec3a160
Author: Eric Newton <eric.newton@gmail.com>
Authored: Mon Feb 24 11:41:16 2014 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Mon Feb 24 11:41:16 2014 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/tserver/log/TabletServerLogger.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/aa61a337/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index 3d1f90e,d25ee75..871f4ae
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@@ -236,10 -234,10 +236,9 @@@ public class TabletServerLogger 
    private int write(Collection<CommitSession> sessions, boolean mincFinish, Writer
writer) throws IOException {
      // Work very hard not to lock this during calls to the outside world
      int currentLogSet = logSetId.get();
 -    
 +
      int seq = -1;
- 
-     int attempt = 0;
 -    
+     int attempt = 1;
      boolean success = false;
      while (!success) {
        try {


Mime
View raw message