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 2014/09/19 21:00:12 UTC
[15/15] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT'
Conflicts:
minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9812ee35
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9812ee35
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9812ee35
Branch: refs/heads/master
Commit: 9812ee35d1c6b8ccea8317f33de4bc9b322151a2
Parents: 449f7e0 3c6876d
Author: Josh Elser <el...@apache.org>
Authored: Fri Sep 19 14:35:48 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Sep 19 14:35:48 2014 -0400
----------------------------------------------------------------------
.../impl/MiniAccumuloConfigImpl.java | 64 ++++++++++----------
.../minicluster/MiniAccumuloClusterTest.java | 15 +++++
2 files changed, 48 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9812ee35/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
----------------------------------------------------------------------
diff --cc minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index c585ecc,e9ad045..9e979b6
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@@ -132,8 -132,7 +132,9 @@@ public class MiniAccumuloConfigImpl imp
mergePropWithRandomPort(Property.TSERV_CLIENTPORT.getKey());
mergePropWithRandomPort(Property.MONITOR_PORT.getKey());
mergePropWithRandomPort(Property.GC_PORT.getKey());
+ mergePropWithRandomPort(Property.MONITOR_LOG4J_PORT.getKey());
+ mergePropWithRandomPort(Property.REPLICATION_RECEIPT_SERVICE_PORT.getKey());
+ mergePropWithRandomPort(Property.MASTER_REPLICATION_COORDINATOR_PORT.getKey());
if (isUseCredentialProvider()) {
updateConfigForCredentialProvider();