Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5734ab13 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5734ab13 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5734ab13 Branch: refs/heads/master Commit: 5734ab1335dca44c25a090073026f83d7d84679e Parents: fbe6ff3 1fe275c Author: Josh Elser <els...@apache.org> Authored: Wed Aug 20 17:05:12 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Aug 20 17:05:12 2014 -0400 ---------------------------------------------------------------------- .../conf/CredentialProviderFactoryShim.java | 186 +++++++++++++++---- .../conf/CredentialProviderFactoryShimTest.java | 24 ++- .../impl/MiniAccumuloConfigImpl.java | 67 ++++++- test/pom.xml | 2 + .../accumulo/test/functional/AbstractMacIT.java | 3 + 5 files changed, 240 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5734ab13/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 2d1b2d7,4878967..c585ecc --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java @@@ -125,9 -132,11 +132,13 @@@ public class MiniAccumuloConfigImpl imp mergePropWithRandomPort(Property.TSERV_CLIENTPORT.getKey()); mergePropWithRandomPort(Property.MONITOR_PORT.getKey()); mergePropWithRandomPort(Property.GC_PORT.getKey()); + mergePropWithRandomPort(Property.REPLICATION_RECEIPT_SERVICE_PORT.getKey()); + mergePropWithRandomPort(Property.MASTER_REPLICATION_COORDINATOR_PORT.getKey()); + if (isUseCredentialProvider()) { + updateConfigForCredentialProvider(); + } + // zookeeper port should be set explicitly in this class, not just on the site config if (zooKeeperPort == 0) zooKeeperPort = PortUtils.getRandomFreePort(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/5734ab13/test/pom.xml ----------------------------------------------------------------------
