You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/05/28 22:55:20 UTC
[1/3] accumulo git commit: ACCUMULO-3864 Synchronize getMiniDfs()
Repository: accumulo
Updated Branches:
refs/heads/1.7 84ccd5ce3 -> 84d614d93
refs/heads/master 071f6fe0b -> 72d83acd2
ACCUMULO-3864 Synchronize getMiniDfs()
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/84d614d9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/84d614d9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/84d614d9
Branch: refs/heads/1.7
Commit: 84d614d93753b97bfc3862614d7a8acb1dcae5cd
Parents: 84ccd5c
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 16:18:11 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 16:18:11 2015 -0400
----------------------------------------------------------------------
.../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/84d614d9/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 19aed0b..2e631b8 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -791,7 +791,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
return stats;
}
- public MiniDFSCluster getMiniDfs() {
+ public synchronized MiniDFSCluster getMiniDfs() {
return this.miniDFS;
}
[3/3] accumulo git commit: Merge branch '1.7'
Posted by el...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/72d83acd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72d83acd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72d83acd
Branch: refs/heads/master
Commit: 72d83acd29b2b208dc5dd81ff4758d3cfff570bd
Parents: 071f6fe 84d614d
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 16:18:57 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 16:18:57 2015 -0400
----------------------------------------------------------------------
.../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/72d83acd/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
[2/3] accumulo git commit: ACCUMULO-3864 Synchronize getMiniDfs()
Posted by el...@apache.org.
ACCUMULO-3864 Synchronize getMiniDfs()
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/84d614d9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/84d614d9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/84d614d9
Branch: refs/heads/master
Commit: 84d614d93753b97bfc3862614d7a8acb1dcae5cd
Parents: 84ccd5c
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 16:18:11 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 16:18:11 2015 -0400
----------------------------------------------------------------------
.../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/84d614d9/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 19aed0b..2e631b8 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -791,7 +791,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
return stats;
}
- public MiniDFSCluster getMiniDfs() {
+ public synchronized MiniDFSCluster getMiniDfs() {
return this.miniDFS;
}