You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/01/30 22:35:51 UTC

[1/2] accumulo git commit: ACCUMULO-3547 stop clearing the cache

Repository: accumulo
Updated Branches:
  refs/heads/master da676d5f7 -> c3493c19b


ACCUMULO-3547 stop clearing the cache


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

Branch: refs/heads/master
Commit: a88299fbf6457a545d765c37df4a1de432f1c834
Parents: 837a0bd
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Jan 30 16:33:42 2015 -0500
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Jan 30 16:33:42 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/server/client/BulkImporter.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a88299fb/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
index ea14f71..59bc09d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
@@ -264,9 +264,9 @@ public class BulkImporter {
       printReport(paths);
       return assignmentStats;
     } finally {
-      if (client != null)
+      if (client != null) {
         ServerClient.close(client);
-      locator.invalidateCache();
+      }
     }
   }
 


[2/2] accumulo git commit: Merge branch '1.6'

Posted by ec...@apache.org.
Merge branch '1.6'


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

Branch: refs/heads/master
Commit: c3493c19be4b06f578fed1d7cc4270d97d64d0ec
Parents: da676d5 a88299f
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Jan 30 16:35:23 2015 -0500
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Jan 30 16:35:23 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/server/client/BulkImporter.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c3493c19/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
----------------------------------------------------------------------