subject:"\[6\/6\] accumulo git commit\: Merge branch '1.8'"

[6/6] accumulo git commit: Merge branch '1.8'

2017-08-07 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 401411619239e301ad14216b3b9c88ee947ab072
Parents: d9c7fa0 5848671
Author: Josh Elser 
Authored: Mon Aug 7 17:38:33 2017 -0400
Committer: Josh Elser 
Committed: Mon Aug 7 17:38:33 2017 -0400

--

--

[6/6] accumulo git commit: Merge branch '1.8'

2017-08-01 Thread ctubbsii

Merge branch '1.8'

This fixes #288


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

Branch: refs/heads/master
Commit: 4b9957bd71565a3a215a5a152a2034d49792e11a
Parents: 542fd6e 591ba9f
Author: Christopher Tubbs 
Authored: Tue Aug 1 20:13:39 2017 -0400
Committer: Christopher Tubbs 
Committed: Tue Aug 1 20:13:39 2017 -0400

--
 .../org/apache/accumulo/server/util/MetadataTableUtil.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4b9957bd/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
--

[6/6] accumulo git commit: Merge branch '1.8'

2017-07-31 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: a9207d537cce5707919ac67ff931476c44162e56
Parents: 1132ae0 0ee13f2
Author: Josh Elser 
Authored: Mon Jul 31 15:55:29 2017 -0400
Committer: Josh Elser 
Committed: Mon Jul 31 15:55:29 2017 -0400

--

--

[6/6] accumulo git commit: Merge branch '1.8'

2017-07-28 Thread ctubbsii

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 1132ae05ac006393151d1efb1f8db1693defc592
Parents: 8c3c078 67f5e95
Author: Christopher Tubbs 
Authored: Fri Jul 28 18:41:51 2017 -0400
Committer: Christopher Tubbs 
Committed: Fri Jul 28 18:41:51 2017 -0400

--
 .../security/tokens/AuthenticationToken.java| 12 +++
 .../impl/MiniAccumuloClusterControl.java| 10 -
 .../minicluster/impl/ProcessReference.java  | 22 +++-
 .../apache/accumulo/server/util/DefaultMap.java |  5 +++--
 .../accumulo/test/functional/LargeRowIT.java|  2 +-
 5 files changed, 29 insertions(+), 22 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2017-07-27 Thread ctubbsii

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 8c3c0783a1273b8237a4c358d8f0d39067f360d4
Parents: dddbba9 a205559
Author: Christopher Tubbs 
Authored: Thu Jul 27 20:27:10 2017 -0400
Committer: Christopher Tubbs 
Committed: Thu Jul 27 20:27:10 2017 -0400

--
 .../org/apache/accumulo/core/client/impl/ThriftScanner.java| 1 -
 .../java/org/apache/accumulo/core/client/mock/MockTable.java   | 2 +-
 .../accumulo/core/client/summary/SummarizerConfiguration.java  | 2 +-
 .../accumulo/core/iterators/system/LocalityGroupIterator.java  | 4 ++--
 .../org/apache/accumulo/core/summary/SummaryCollection.java| 1 -
 .../accumulo/core/iterators/system/ColumnFilterTest.java   | 6 +++---
 .../apache/accumulo/core/summary/SummaryCollectionTest.java| 4 ++--
 .../server/master/balancer/HostRegexTableLoadBalancer.java | 2 +-
 .../org/apache/accumulo/server/security/UserImpersonation.java | 1 -
 .../master/balancer/BaseHostRegexTableLoadBalancerTest.java| 4 ++--
 .../src/main/java/org/apache/accumulo/master/Master.java   | 2 +-
 .../apache/accumulo/tserver/TabletServerResourceManager.java   | 2 +-
 .../apache/accumulo/tserver/LargestFirstMemoryManagerTest.java | 2 +-
 .../org/apache/accumulo/test/BalanceWithOfflineTableIT.java| 1 -
 .../apache/accumulo/test/functional/FunctionalTestUtils.java   | 2 +-
 15 files changed, 16 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c3c0783/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c3c0783/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c3c0783/core/src/main/java/org/apache/accumulo/core/client/summary/SummarizerConfiguration.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/summary/SummarizerConfiguration.java
index ec98695,000..45fb7b1
mode 100644,00..100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/summary/SummarizerConfiguration.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/summary/SummarizerConfiguration.java
@@@ -1,285 -1,0 +1,285 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.core.client.summary;
 +
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.Collection;
 +import java.util.Collections;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +
 +import org.apache.accumulo.core.summary.SummarizerConfigurationUtil;
 +
 +import com.google.common.base.Preconditions;
 +import com.google.common.collect.ImmutableMap;
 +import com.google.common.hash.Hasher;
 +import com.google.common.hash.Hashing;
 +
 +/**
 + * This class encapsulates the configuration needed to instantiate a {@link 
Summarizer}. It also provides methods and documentation for setting the table
 + * properties that configure a Summarizer.
 + *
 + * @since 2.0.0
 + */
 +public class SummarizerConfiguration {
 +
 +  private final String className;
 +  private final Map options;
 +  private int hashCode = 0;
 +  private final String configId;
 +
 +  private SummarizerConfiguration(String className, String configId, 
Map options) {
 +this.className = className;
 +this.options = ImmutableMap.copyOf(options);
 +
 +if (configId == null) {
 +  ArrayList keys = new ArrayList<>(this.options.keySet());
 +  Collections.sort(keys);
 +  Hasher hasher = Hashing.murmur3_32().newHasher();
 +

[6/6] accumulo git commit: Merge branch '1.8'

2017-07-27 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: dddbba9724052354f5e52912e63b164f92e26a48
Parents: 3fcc76f 3f01418
Author: Josh Elser 
Authored: Thu Jul 27 19:31:22 2017 -0400
Committer: Josh Elser 
Committed: Thu Jul 27 19:31:22 2017 -0400

--

--

[6/6] accumulo git commit: Merge branch '1.8'

2017-06-27 Thread elserj

Merge branch '1.8'

Closes #274


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

Branch: refs/heads/master
Commit: 3708d70940600488872269bb701d5126498e4c16
Parents: 4e98a8f c78605d
Author: Josh Elser 
Authored: Tue Jun 27 17:41:48 2017 -0400
Committer: Josh Elser 
Committed: Tue Jun 27 18:10:45 2017 -0400

--
 .../client/security/tokens/KerberosToken.java   |  18 +-
 .../accumulo/core/cli/TestClientOpts.java   | 276 ---
 .../security/tokens/KerberosTokenTest.java  |  51 
 .../security/KerberosTokenEmbeddedKDCTest.java  | 112 
 .../test/security/KerberosTokenTest.java| 112 
 5 files changed, 177 insertions(+), 392 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3708d709/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
--
diff --cc core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
index 3da5b30,3da5b30..000
deleted file mode 100644,100644
--- a/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
+++ /dev/null
@@@ -1,276 -1,276 +1,0 @@@
--/*
-- * Licensed to the Apache Software Foundation (ASF) under one or more
-- * contributor license agreements.  See the NOTICE file distributed with
-- * this work for additional information regarding copyright ownership.
-- * The ASF licenses this file to You under the Apache License, Version 2.0
-- * (the "License"); you may not use this file except in compliance with
-- * the License.  You may obtain a copy of the License at
-- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an "AS IS" BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--package org.apache.accumulo.core.cli;
--
--import static org.junit.Assert.assertEquals;
--import static org.junit.Assert.assertFalse;
--import static org.junit.Assert.assertNull;
--import static org.junit.Assert.assertTrue;
--import static org.junit.Assert.fail;
--
--import java.io.DataInput;
--import java.io.DataOutput;
--import java.io.File;
--import java.io.FileWriter;
--import java.io.IOException;
--import java.util.Set;
--import java.util.UUID;
--import java.util.concurrent.TimeUnit;
--
--import javax.security.auth.DestroyFailedException;
--
--import org.apache.accumulo.core.client.BatchWriterConfig;
--import org.apache.accumulo.core.client.ClientConfiguration;
--import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
--import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
--import org.apache.accumulo.core.client.security.tokens.KerberosToken;
--import org.apache.accumulo.core.client.security.tokens.PasswordToken;
--import org.apache.accumulo.core.conf.Property;
--import org.apache.accumulo.core.security.Authorizations;
--import org.junit.Rule;
--import org.junit.Test;
--import org.junit.rules.TemporaryFolder;
--import org.junit.rules.TestName;
--
--import com.beust.jcommander.JCommander;
--
--public class TestClientOpts {
--
--  @Rule
--  public TemporaryFolder tmpDir = new TemporaryFolder(new 
File(System.getProperty("user.dir") + "/target"));
--
--  @Rule
--  public TestName testName = new TestName();
--
--  @Test
--  public void test() throws Exception {
--BatchWriterConfig cfg = new BatchWriterConfig();
--
--// document the defaults
--ClientOpts args = new ClientOpts();
--BatchWriterOpts bwOpts = new BatchWriterOpts();
--BatchScannerOpts bsOpts = new BatchScannerOpts();
--try {
--  args.getPrincipal();
--  fail("Expected to receive exception fetching non-existent principal");
--} catch (RuntimeException e) {
--  // Pass -- no explicit principal and no token to infer a principal from
--}
--
--assertNull(args.getSecurePassword());
--try {
--  args.getToken();
--  fail("Expected to receive exception fetching non-existent token");
--} catch (RuntimeException e) {
--  // pass - no console to prompt user for password
--}
--assertEquals(Long.valueOf(cfg.getMaxLatency(TimeUnit.MILLISECONDS)), 
bwOpts.batchLatency);
--assertEquals(Long.valueOf(cfg.getTimeout(TimeUnit.MILLISECONDS)), 
bwOpts.batchTimeout);
--assertEquals(Long.valueOf(cfg.getMaxMemory()), bwOpts.batchMemory);
--assertFalse(args.debug);
--assertFalse(args.trace);
--

[6/6] accumulo git commit: Merge branch '1.8'

2017-06-26 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 4e98a8fbc3175f5a1df8bfe64ddeaab9f047ed32
Parents: d801970 6b13976
Author: Josh Elser 
Authored: Mon Jun 26 18:16:50 2017 -0400
Committer: Josh Elser 
Committed: Mon Jun 26 18:16:50 2017 -0400

--
 .../client/security/tokens/KerberosToken.java   |  19 ++--
 .../apache/accumulo/core/rpc/ThriftUtil.java|  23 +++-
 .../test/functional/KerberosProxyIT.java| 109 ++-
 3 files changed, 134 insertions(+), 17 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2017-06-21 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: e7c5e2474a82bb9ae6857187273cabc4cd13ddde
Parents: 81393b8 15055b4
Author: Josh Elser 
Authored: Wed Jun 21 12:43:08 2017 -0400
Committer: Josh Elser 
Committed: Wed Jun 21 12:43:08 2017 -0400

--
 .../java/org/apache/accumulo/monitor/servlets/trace/BasicTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2017-06-21 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 81393b88415836e83cd9d0849cfed52acec86aed
Parents: 87c1abc a351610
Author: Josh Elser 
Authored: Wed Jun 21 11:19:41 2017 -0400
Committer: Josh Elser 
Committed: Wed Jun 21 11:33:45 2017 -0400

--
 server/monitor/pom.xml  |  5 ++
 .../accumulo/monitor/servlets/trace/Basic.java  |  2 +-
 .../monitor/servlets/trace/BasicTest.java   | 55 
 3 files changed, 61 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/81393b88/server/monitor/pom.xml
--
diff --cc server/monitor/pom.xml
index edaedff,d43d2f1..96d763b
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@@ -118,10 -129,10 +118,15 @@@
test
  
  
+   org.easymock
+   easymock
+   test
+ 
++
 +  org.slf4j
 +  slf4j-log4j12
 +  test
 +

[6/6] accumulo git commit: Merge branch '1.8'

2017-06-13 Thread mwalch

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: daeb78bd1783ba2ec82570584aa81c5f10d8a5b2
Parents: 83f3510 2b72e7c
Author: Mike Walch 
Authored: Tue Jun 13 15:43:58 2017 -0400
Committer: Mike Walch 
Committed: Tue Jun 13 15:43:58 2017 -0400

--
 assemble/build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2017-06-12 Thread ctubbsii

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 83f35102d95f023e13908db05db44c8507f193a2
Parents: 15b9c3e 3a00511
Author: Christopher Tubbs 
Authored: Mon Jun 12 22:54:15 2017 -0400
Committer: Christopher Tubbs 
Committed: Mon Jun 12 22:54:15 2017 -0400

--
 .../accumulo/core/client/impl/AccumuloServerException.java| 4 
 .../apache/accumulo/core/client/impl/TableOperationsImpl.java | 7 +--
 2 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/83f35102/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
--

[6/6] accumulo git commit: Merge branch '1.8'

2017-06-08 Thread ctubbsii

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 5956d45695c3aef6d97335b4ba0fddd4b018aa51
Parents: 39efb48 da695f6
Author: Christopher Tubbs 
Authored: Thu Jun 8 23:21:50 2017 -0400
Committer: Christopher Tubbs 
Committed: Thu Jun 8 23:21:50 2017 -0400

--
 .../accumulo/core/conf/SiteConfiguration.java   | 20 +---
 .../accumulo/core/file/rfile/PrintInfo.java |  4 +---
 .../core/file/rfile/bcfile/PrintInfo.java   |  3 +--
 .../server/conf/ServerConfigurationFactory.java |  2 +-
 .../java/org/apache/accumulo/shell/Shell.java   |  6 +++---
 .../apache/accumulo/shell/ShellOptionsJC.java   |  3 +--
 .../accumulo/shell/commands/FateCommand.java|  3 +--
 .../apache/accumulo/test/util/CertUtils.java|  4 ++--
 8 files changed, 15 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5956d456/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
index d88a7f0,9f047e2..213a895
--- a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
@@@ -94,35 -84,15 +88,31 @@@ public class SiteConfiguration extends 
  return instance;
}
  
-   synchronized public static SiteConfiguration getInstance() {
- return getInstance(DefaultConfiguration.getInstance());
-   }
- 
synchronized private static Configuration getXmlConfig() {
 -String configFile = System.getProperty("org.apache.accumulo.config.file", 
"accumulo-site.xml");
  if (xmlConfig == null) {
xmlConfig = new Configuration(false);
 -
 -  if (SiteConfiguration.class.getClassLoader().getResource(configFile) == 
null)
 -log.warn(configFile + " not found on classpath", new Throwable());
 -  else
 -xmlConfig.addResource(configFile);
 +  String configFile = System.getProperty("accumulo.configuration", 
"accumulo-site.xml");
 +  if (configFile.startsWith("file://")) {
 +try {
 +  File f = new File(new URI(configFile));
 +  if (f.exists() && !f.isDirectory()) {
 +xmlConfig.addResource(f.toURI().toURL());
 +log.info("Loaded configuration from filesystem at {}", 
configFile);
 +  } else {
 +log.warn("Failed to load Accumulo configuration from " + 
configFile, new Throwable());
 +  }
 +} catch (MalformedURLException | URISyntaxException e) {
 +  log.warn("Failed to load Accumulo configuration from " + 
configFile, e);
 +}
 +  } else {
 +URL accumuloConfigUrl = 
SiteConfiguration.class.getClassLoader().getResource(configFile);
 +if (accumuloConfigUrl == null) {
 +  log.warn("Accumulo configuration '" + configFile + "' is not on 
classpath", new Throwable());
 +} else {
 +  xmlConfig.addResource(accumuloConfigUrl);
 +  log.info("Loaded configuration from classpath at {}", 
accumuloConfigUrl.getFile());
 +}
 +  }
  }
  return xmlConfig;
}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5956d456/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5956d456/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
--
diff --cc 
server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
index 02a8301,f79f707..65451a6
--- 
a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
@@@ -102,7 -119,8 +102,7 @@@ public class ServerConfigurationFactor
  
public synchronized SiteConfiguration getSiteConfiguration() {
  if (siteConfig == null) {
-   siteConfig = SiteConfiguration.getInstance(getDefaultConfiguration());
 -  checkPermissions();
+   siteConfig = SiteConfiguration.getInstance();
  }
  return siteConfig;
}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5956d456/shell/src/main/java/org/apache/accumulo/shell/Shell.java
--

[6/6] accumulo git commit: Merge branch '1.8'

2017-05-03 Thread elserj

Merge branch '1.8'

ACCUMULO-4506 Closes #254


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

Branch: refs/heads/master
Commit: 6128f024d44f75584de86e91bbba6833db4cdab4
Parents: ac460d0 c093b56
Author: Josh Elser 
Authored: Wed May 3 17:18:06 2017 -0400
Committer: Josh Elser 
Committed: Wed May 3 17:18:50 2017 -0400

--
 .../core/client/impl/ReplicationClient.java  | 10 ++
 .../org/apache/accumulo/core/conf/Property.java  |  2 ++
 .../org/apache/accumulo/core/rpc/ThriftUtil.java |  2 +-
 .../replication/AccumuloReplicaSystem.java   | 19 ---
 4 files changed, 21 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6128f024/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6128f024/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index d930775,7000eb3..d110062
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@@ -276,9 -278,11 +278,11 @@@ public class AccumuloReplicaSystem impl
  
  final HostAndPort peerTserver = 
HostAndPort.fromString(peerTserverStr);
  
+ final long timeout = 
localConf.getTimeInMillis(Property.REPLICATION_RPC_TIMEOUT);
+ 
  // We have a tserver on the remote -- send the data its way.
  Status finalStatus;
 -final long sizeLimit = 
conf.getMemoryInBytes(Property.REPLICATION_MAX_UNIT_SIZE);
 +final long sizeLimit = 
conf.getAsBytes(Property.REPLICATION_MAX_UNIT_SIZE);
  try {
if (p.getName().endsWith(RFILE_SUFFIX)) {
  span = Trace.start("RFile replication");

[6/6] accumulo git commit: Merge branch '1.8'

2017-04-20 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 92c45a8960768358f203892b9c268c3cf42db427
Parents: 0549662 bca75d3
Author: Josh Elser 
Authored: Thu Apr 20 22:46:54 2017 -0400
Committer: Josh Elser 
Committed: Thu Apr 20 22:46:54 2017 -0400

--
 .../main/asciidoc/chapters/troubleshooting.txt  | 29 
 1 file changed, 29 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/92c45a89/docs/src/main/asciidoc/chapters/troubleshooting.txt
--

[6/6] accumulo git commit: Merge branch '1.8'

2017-04-13 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 3b9fd3f5c50e9aee668fa158bf99764c9a40f651
Parents: f09af2e 0f13792
Author: Josh Elser 
Authored: Thu Apr 13 13:19:45 2017 -0400
Committer: Josh Elser 
Committed: Thu Apr 13 13:19:45 2017 -0400

--
 .../accumulo/core/iterators/OrIterator.java | 263 +--
 .../org/apache/accumulo/test/OrIteratorIT.java  | 317 +++
 2 files changed, 479 insertions(+), 101 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2017-03-27 Thread ctubbsii

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 07bfa2e5b687d6fabd107206c525169c321f8707
Parents: b4f86d9 8d6b729
Author: Christopher Tubbs 
Authored: Mon Mar 27 19:48:48 2017 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 27 19:48:48 2017 -0400

--
 core/src/main/java/org/apache/accumulo/core/conf/Property.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/07bfa2e5/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 4472a54,333aed6..6b92111
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -458,14 -447,14 +458,14 @@@ public enum Property 
TABLE_FILE_TYPE("table.file.type", RFile.EXTENSION, PropertyType.STRING, 
"Change the type of file a table writes"),
TABLE_LOAD_BALANCER("table.balancer", 
"org.apache.accumulo.server.master.balancer.DefaultLoadBalancer", 
PropertyType.STRING,
"This property can be set to allow the LoadBalanceByTable load balancer 
to change the called Load Balancer for this table"),
-   TABLE_FILE_COMPRESSION_TYPE("table.file.compress.type", "gz", 
PropertyType.STRING, "One of gz,lzo,none"),
+   TABLE_FILE_COMPRESSION_TYPE("table.file.compress.type", "gz", 
PropertyType.STRING, "One of gz,snappy,lzo,none"),
 -  TABLE_FILE_COMPRESSED_BLOCK_SIZE("table.file.compress.blocksize", "100K", 
PropertyType.MEMORY,
 +  TABLE_FILE_COMPRESSED_BLOCK_SIZE("table.file.compress.blocksize", "100K", 
PropertyType.BYTES,
"Similar to the hadoop io.seqfile.compress.blocksize setting, so that 
files have better query performance. The maximum value for this is "
+ Integer.MAX_VALUE + ". (This setting is the size threshold prior 
to compression, and applies even compression is disabled.)"),
 -  
TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX("table.file.compress.blocksize.index", 
"128K", PropertyType.MEMORY,
 +  
TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX("table.file.compress.blocksize.index", 
"128K", PropertyType.BYTES,
"Determines how large index blocks can be in files that support 
multilevel indexes. The maximum value for this is " + Integer.MAX_VALUE + "."
+ " (This setting is the size threshold prior to compression, and 
applies even compression is disabled.)"),
 -  TABLE_FILE_BLOCK_SIZE("table.file.blocksize", "0B", PropertyType.MEMORY,
 +  TABLE_FILE_BLOCK_SIZE("table.file.blocksize", "0B", PropertyType.BYTES,
"Overrides the hadoop dfs.block.size setting so that files have better 
query performance. The maximum value for this is " + Integer.MAX_VALUE),
TABLE_FILE_REPLICATION("table.file.replication", "0", PropertyType.COUNT, 
"Determines how many replicas to keep of a tables' files in HDFS. "
+ "When this value is LTE 0, HDFS defaults are used."),

[6/6] accumulo git commit: Merge branch '1.8'

2017-02-22 Thread ctubbsii

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: d5d18dda38af19a810bc1b894f6448286ad35e03
Parents: 6494a82 3430da2
Author: Christopher Tubbs 
Authored: Wed Feb 22 14:22:25 2017 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 22 14:22:25 2017 -0500

--
 server/monitor/src/main/resources/web/vis.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2017-01-17 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 07ef189c4b16a938281299f77e278a3d863eed2b
Parents: dca2ff9 2a0375a
Author: Josh Elser 
Authored: Tue Jan 17 16:43:42 2017 -0500
Committer: Josh Elser 
Committed: Tue Jan 17 16:43:42 2017 -0500

--
 .../accumulo/server/master/balancer/DefaultLoadBalancer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2017-01-09 Thread ctubbsii

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 0de942d71b4260b68e7ee41c262c01aca407e6b7
Parents: 1474e1c da47fb2
Author: Christopher Tubbs 
Authored: Mon Jan 9 17:29:54 2017 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 9 17:29:54 2017 -0500

--
 NOTICE   | 2 +-
 assemble/src/main/resources/NOTICE   | 2 +-
 docs/src/main/asciidoc/accumulo_user_manual.asciidoc | 2 +-
 server/native/src/main/resources/NOTICE  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-12-11 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 315ccd921cd72409a2eb11fad5c2b045e43567de
Parents: 3dc9b37 5a11a02
Author: Josh Elser 
Authored: Sun Dec 11 16:45:22 2016 -0500
Committer: Josh Elser 
Committed: Sun Dec 11 16:45:22 2016 -0500

--
 .../java/org/apache/accumulo/server/util/RestoreZookeeper.java| 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/315ccd92/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-12-09 Thread busbey

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 3dc9b373d0fb9a78efefefc640e0e395e42ce1c7
Parents: 8e0f19a 037c138
Author: Sean Busbey 
Authored: Fri Dec 9 15:39:14 2016 -0600
Committer: Sean Busbey 
Committed: Fri Dec 9 15:39:14 2016 -0600

--
 .../org/apache/accumulo/tracer/TraceServer.java | 76 
 1 file changed, 48 insertions(+), 28 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-10-17 Thread busbey

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: c4749ac35840813b11d3c386136b9ee257f19bd1
Parents: 3d11cab c743109
Author: Sean Busbey 
Authored: Mon Oct 17 14:42:22 2016 -0700
Committer: Sean Busbey 
Committed: Mon Oct 17 14:42:22 2016 -0700

--
 .../java/org/apache/accumulo/monitor/servlets/trace/Basic.java| 3 +++
 1 file changed, 3 insertions(+)
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-10-14 Thread ctubbsii

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 3d11cab035c72c7dbd2354a7e5917f62eafc1252
Parents: 693d5be 9c11f72
Author: Christopher Tubbs 
Authored: Fri Oct 14 17:46:56 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Oct 14 17:46:56 2016 -0400

--
 .../NonCachingSecretKeyEncryptionStrategy.java  | 61 +++-
 1 file changed, 33 insertions(+), 28 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-10-11 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: f9e6304666151201d68d2941c61942d41d5a9787
Parents: a56e045 9803093
Author: Josh Elser 
Authored: Tue Oct 11 23:17:57 2016 -0400
Committer: Josh Elser 
Committed: Tue Oct 11 23:17:57 2016 -0400

--
 .../src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f9e63046/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-10-08 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 79ec6409f24425b70c84b795e41f9c2d5dad3708
Parents: f206bef f8fbf32
Author: Josh Elser 
Authored: Sat Oct 8 16:50:37 2016 -0400
Committer: Josh Elser 
Committed: Sat Oct 8 16:50:37 2016 -0400

--
 docs/src/main/asciidoc/chapters/kerberos.txt | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/79ec6409/docs/src/main/asciidoc/chapters/kerberos.txt
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-10-06 Thread busbey

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 9dddeed885d8ae4c6ba34eca561dcdb747131d68
Parents: 1c218de 91269bf
Author: Sean Busbey 
Authored: Fri Oct 7 00:28:21 2016 -0500
Committer: Sean Busbey 
Committed: Fri Oct 7 00:28:21 2016 -0500

--
 docs/src/main/asciidoc/chapters/kerberos.txt | 104 +-
 1 file changed, 101 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9dddeed8/docs/src/main/asciidoc/chapters/kerberos.txt
--
diff --cc docs/src/main/asciidoc/chapters/kerberos.txt
index 7817c8d,bfb7cb7..48553b7
--- a/docs/src/main/asciidoc/chapters/kerberos.txt
+++ b/docs/src/main/asciidoc/chapters/kerberos.txt
@@@ -558,5 -621,40 +621,40 @@@ Caused by: org.apache.thrift.transport.
  on, is extremely important when negotiating an SASL connection. This problem 
commonly arises when the Accumulo
  servers are not configured to listen on the address denoted by their FQDN.
  
 -The values in the Accumulo "hosts" files (In +$ACCUMULO_CONF_DIR+: +masters+, 
+monitors+, +slaves+, +tracers+,
 +The values in the Accumulo "hosts" files (In +$ACCUMULO_CONF_DIR+: +masters+, 
+monitors+, +tservers+, +tracers+,
  and +gc+) should match the instance componentof the Kerberos server principal 
(e.g. +host+ in +accumulo/h...@example.com+).
+ 
+ *Q*: After configuring my system for Kerberos, server processes come up 
normally and I can interact with the system. However,
+ when I attempt to use the "Recent Traces" page on the Monitor UI I get a 
stacktrace similar to:
+ 
+ 
+  
java.lang.AssertionError: AuthenticationToken should not be null
+at 
org.apache.accumulo.monitor.servlets.trace.Basic.getScanner(Basic.java:139)
+   at 
org.apache.accumulo.monitor.servlets.trace.Summary.pageBody(Summary.java:164)
+   at 
org.apache.accumulo.monitor.servlets.BasicServlet.doGet(BasicServlet.java:63)
+at 
javax.servlet.http.HttpServlet.service(HttpServlet.java:687)
+at 
javax.servlet.http.HttpServlet.service(HttpServlet.java:790)
+   at 
org.eclipse.jetty.servlet.ServletHolder.handle(ServletHolder.java:738)
+ at 
org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:551)
+   at 
org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:143)
+at 
org.eclipse.jetty.security.SecurityHandler.handle(SecurityHandler.java:568)
+ at 
org.eclipse.jetty.server.session.SessionHandler.doHandle(SessionHandler.java:221)
+ at 
org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:)
+ at 
org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:478)
+  at 
org.eclipse.jetty.server.session.SessionHandler.doScope(SessionHandler.java:183)
+ at 
org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:1045)
+   at 
org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:141)
+   at 
org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:97)
+  
at org.eclipse.jetty.server.Server.handle(Server.java:462)
+ at 
org.eclipse.jetty.server.HttpChannel.handle(HttpChannel.java:279)
+at

[6/6] accumulo git commit: Merge branch '1.8'

2016-09-29 Thread ctubbsii

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: eac5f8927e0d431984c799dd07f63f81d2dc855c
Parents: 7fe029f 272ac28
Author: Christopher Tubbs 
Authored: Thu Sep 29 16:00:46 2016 -0400
Committer: Christopher Tubbs 
Committed: Thu Sep 29 16:00:46 2016 -0400

--
 docs/pom.xml |  6 ++
 docs/src/main/asciidoc/accumulo_user_manual.asciidoc |  6 +++---
 docs/src/main/asciidoc/chapters/administration.txt   |  4 ++--
 docs/src/main/asciidoc/chapters/clients.txt  |  2 +-
 docs/src/main/asciidoc/chapters/kerberos.txt |  2 +-
 docs/src/main/resources/examples/README  |  2 +-
 pom.xml  | 12 
 7 files changed, 26 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/eac5f892/docs/pom.xml
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eac5f892/docs/src/main/asciidoc/chapters/administration.txt
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eac5f892/docs/src/main/asciidoc/chapters/kerberos.txt
--
diff --cc docs/src/main/asciidoc/chapters/kerberos.txt
index 958133c,a165221..7817c8d
--- a/docs/src/main/asciidoc/chapters/kerberos.txt
+++ b/docs/src/main/asciidoc/chapters/kerberos.txt
@@@ -558,5 -558,5 +558,5 @@@ Caused by: org.apache.thrift.transport.
  on, is extremely important when negotiating an SASL connection. This problem 
commonly arises when the Accumulo
  servers are not configured to listen on the address denoted by their FQDN.
  
 -The values in the Accumulo "hosts" files (In +$ACCUMULO_CONF_DIR+: +masters+, 
+monitors+, +slaves+, +tracers+,
 +The values in the Accumulo "hosts" files (In +$ACCUMULO_CONF_DIR+: +masters+, 
+monitors+, +tservers+, +tracers+,
- and +gc+) should match the instance componentof the Kerberos server principal 
(e.g. +host+ in +accumulo/host\@EXAMPLE.COM+).
+ and +gc+) should match the instance componentof the Kerberos server principal 
(e.g. +host+ in +accumulo/h...@example.com+).

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eac5f892/pom.xml
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-09-27 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 7a084564337eafb644a05231bedd78109a018a20
Parents: 33c38ed 5a8669a
Author: Josh Elser 
Authored: Tue Sep 27 21:11:40 2016 -0400
Committer: Josh Elser 
Committed: Tue Sep 27 21:11:40 2016 -0400

--
 test/system/continuous/README.md | 5 +
 1 file changed, 5 insertions(+)
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-09-27 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 9c6ed1837e40c68205c4b40bee30a4d37ec541b4
Parents: 6823140 a2ac4dd
Author: Josh Elser 
Authored: Tue Sep 27 15:53:28 2016 -0400
Committer: Josh Elser 
Committed: Tue Sep 27 15:53:28 2016 -0400

--
 .../org/apache/accumulo/test/ExistingMacIT.java   | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-09-26 Thread busbey

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 6823140eb5f3fded282eb02daf8d3f6f9d80c3b4
Parents: ababa81 38606a8
Author: Sean Busbey 
Authored: Mon Sep 26 11:05:38 2016 -0500
Committer: Sean Busbey 
Committed: Mon Sep 26 11:05:38 2016 -0500

--
 docs/src/main/asciidoc/chapters/replication.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6823140e/docs/src/main/asciidoc/chapters/replication.txt
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-09-25 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 34b85c94419283c3e9005a1421af1ac15d8600df
Parents: ab2a93a 509ce98
Author: Josh Elser 
Authored: Sun Sep 25 22:19:15 2016 -0400
Committer: Josh Elser 
Committed: Sun Sep 25 22:19:15 2016 -0400

--
 .../apache/accumulo/test/randomwalk/multitable/CopyTable.java | 4 ++--
 .../accumulo/test/randomwalk/multitable/CreateTable.java  | 4 ++--
 .../apache/accumulo/test/randomwalk/multitable/DropTable.java | 4 ++--
 .../test/randomwalk/multitable/MultiTableFixture.java | 7 ---
 .../accumulo/test/randomwalk/multitable/OfflineTable.java | 4 ++--
 .../org/apache/accumulo/test/randomwalk/multitable/Write.java | 4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-09-23 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: ab2a93adaec3ec14d5b3c34d33fbeebb144c8aea
Parents: 0bf8f8e 33f7301
Author: Josh Elser 
Authored: Fri Sep 23 10:53:28 2016 -0400
Committer: Josh Elser 
Committed: Fri Sep 23 10:53:28 2016 -0400

--
 .../apache/accumulo/core/cli/ClientOpts.java| 37 
 .../accumulo/core/cli/TestClientOpts.java   | 12 ---
 .../org/apache/accumulo/server/util/Admin.java  | 14 +---
 3 files changed, 39 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab2a93ad/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
--
diff --cc core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index a73da7b,362bad9..57f8774
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@@ -57,7 -56,10 +57,9 @@@ import org.apache.log4j.Logger
  import com.beust.jcommander.DynamicParameter;
  import com.beust.jcommander.IStringConverter;
  import com.beust.jcommander.Parameter;
 -import com.google.common.base.Predicate;
  
+ import jline.console.ConsoleReader;
+ 
  public class ClientOpts extends Help {
  
public static class TimeConverter implements IStringConverter {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab2a93ad/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-09-16 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: c9391894e0a195cc0d7fea5915c8be81ee154d92
Parents: 780045c 5df4f03
Author: Josh Elser 
Authored: Fri Sep 16 12:59:52 2016 -0400
Committer: Josh Elser 
Committed: Fri Sep 16 12:59:52 2016 -0400

--
 .../java/org/apache/accumulo/core/client/impl/ConnectorImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c9391894/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-09-10 Thread ctubbsii

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 32a39cb1d1f96681d28453ad17d88e089730387d
Parents: aea7cf1 8c85c32
Author: Christopher Tubbs 
Authored: Sat Sep 10 18:55:12 2016 -0400
Committer: Christopher Tubbs 
Committed: Sat Sep 10 18:55:12 2016 -0400

--
 docs/src/main/resources/design/ACCUMULO-378-design.mdtext | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-09-09 Thread ctubbsii

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 67071206d196420701c679a2d549dc3104053f90
Parents: df3ce2f ba0f0d4
Author: Christopher Tubbs 
Authored: Fri Sep 9 15:18:18 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Sep 9 15:18:18 2016 -0400

--
 .../resources/design/ACCUMULO-378-design.mdtext | 936 +--
 1 file changed, 468 insertions(+), 468 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-09-09 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: df3ce2f9a6ee27104e99e4f2725066099235e878
Parents: bbc3229 d3401dd
Author: Josh Elser 
Authored: Fri Sep 9 15:05:53 2016 -0400
Committer: Josh Elser 
Committed: Fri Sep 9 15:05:53 2016 -0400

--

--

[6/6] accumulo git commit: Merge branch '1.8'

2016-08-31 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 5e730f9ffee2fbd9cc82895cce35e4be16279536
Parents: cca8b89 2c50d63
Author: Josh Elser 
Authored: Wed Aug 31 17:22:36 2016 -0400
Committer: Josh Elser 
Committed: Wed Aug 31 17:22:36 2016 -0400

--
 .../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5e730f9f/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-08-26 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: fd46656d94214a6b5ae5a89cde266c25a15863eb
Parents: 20ed2b0 d7c50d1
Author: Josh Elser 
Authored: Fri Aug 26 13:24:47 2016 -0400
Committer: Josh Elser 
Committed: Fri Aug 26 13:24:47 2016 -0400

--
 .../java/org/apache/accumulo/master/replication/WorkMaker.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-08-17 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: ef380e1efd01e5d76add75eef0f61417c3e5bc7c
Parents: 418289c 4bc75b1
Author: Josh Elser 
Authored: Wed Aug 17 16:28:05 2016 -0400
Committer: Josh Elser 
Committed: Wed Aug 17 16:28:05 2016 -0400

--
 .../test/functional/KerberosProxyIT.java| 107 ++-
 1 file changed, 83 insertions(+), 24 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-08-15 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 45d73b1fa7883aa8109f9dec37f4c5b065890348
Parents: 62ba8ef 8c3094f
Author: Josh Elser 
Authored: Mon Aug 15 15:11:38 2016 -0400
Committer: Josh Elser 
Committed: Mon Aug 15 15:11:38 2016 -0400

--
 .../core/client/impl/ThriftScanner.java | 16 ---
 .../org/apache/accumulo/core/conf/Property.java |  2 +
 .../core/client/impl/ThriftScannerTest.java | 45 
 3 files changed, 56 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/45d73b1f/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
index 6e07b30,fc3be57..7f85afc
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
@@@ -207,13 -208,13 +208,13 @@@ public class ThriftScanner 
  
}
  
-   private static long pause(long millis) throws InterruptedException {
+   static long pause(long millis, long maxSleep) throws InterruptedException {
  Thread.sleep(millis);
  // wait 2 * last time, with +-10% random jitter
- return (long) (Math.max(millis * 2, 3000) * (.9 + Math.random() / 5));
+ return (long) (Math.min(millis * 2, maxSleep) * (.9 + Math.random() / 5));
}
  
 -  public static List scan(ClientContext context, ScanState 
scanState, int timeOut) throws ScanTimedOutException, AccumuloException,
 +  public static List scan(ClientContext context, ScanState 
scanState, long timeOut) throws ScanTimedOutException, AccumuloException,
AccumuloSecurityException, TableNotFoundException {
  TabletLocation loc = null;
  Instance instance = context.getInstance();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/45d73b1f/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-07-25 Thread ctubbsii

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 987d2c01860e6684b86f7892852239aa779c758c
Parents: 976854c 2a373da
Author: Christopher Tubbs 
Authored: Mon Jul 25 15:53:24 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Jul 25 15:53:24 2016 -0400

--
 assemble/pom.xml| 21 ---
 assemble/src/main/assemblies/dev-directory.xml  | 27 
 pom.xml |  4 +++
 server/native/pom.xml   | 15 +++
 .../native/src/main/assemblies/native-dir.xml   | 27 
 .../src/main/assemblies/native-tarball.xml  |  1 -
 6 files changed, 46 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/987d2c01/assemble/pom.xml
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/987d2c01/pom.xml
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/987d2c01/server/native/pom.xml
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-07-22 Thread ctubbsii

Merge branch '1.8'

Conflicts:
assemble/pom.xml
test/pom.xml


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

Branch: refs/heads/master
Commit: 976854c6ad258c46e1ea9b5fba2aa4535f71c816
Parents: 2c55074 6cc07fa
Author: Christopher Tubbs 
Authored: Fri Jul 22 19:39:40 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Jul 22 19:39:40 2016 -0400

--
 README.md |  10 +-
 assemble/build.sh |   2 +-
 assemble/pom.xml  | 151 ++-
 docs/pom.xml  | 248 ++---
 pom.xml   |   2 +-
 server/native/pom.xml |   1 +
 test/pom.xml  |  48 -
 7 files changed, 207 insertions(+), 255 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/README.md
--
diff --cc README.md
index 4269001,fd57394..4cca80d
--- a/README.md
+++ b/README.md
@@@ -55,12 -53,13 +55,13 @@@ to run them after following the [instal
  Building
  
  
 -Accumulo uses [Maven][9] to compile, [test][3], and package its source.  The
 +Accumulo uses [Maven] to compile, [test], and package its source.  The
  following command will build the binary tar.gz from source.  Note, these
  instructions will not work for the Accumulo binary distribution as it does not
- include source.
+ include source.  If you just want to build without waiting for the tests to
+ run, add `-DskipTests`.
  
- mvn package -P assemble
+ mvn package
  
  This command produces a file at the following location.
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/assemble/pom.xml
--
diff --cc assemble/pom.xml
index 44dfceb,9c1639a..e009faa
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@@ -110,7 -136,13 +136,8 @@@
  
  
org.apache.accumulo
 -  accumulo-trace
 -  true
 -
 -
 -  org.apache.accumulo
accumulo-tracer
+   true
  
  
org.apache.accumulo

http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/docs/pom.xml
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/pom.xml
--
diff --cc pom.xml
index 110cdc7,a09eb87..1c98549
--- a/pom.xml
+++ b/pom.xml
@@@ -724,10 -692,8 +724,10 @@@
  
org.apache.maven.plugins
maven-release-plugin
 +  
 +  2.5.3

- -P !autoformat,thrift,assemble,docs,sunny 
-Dtimeout.factor=2 ${extraReleaseArgs}
+ -P !autoformat,thrift,sunny -Dtimeout.factor=2 
${extraReleaseArgs}
  true
  clean deploy
  clean verify

http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/server/native/pom.xml
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/test/pom.xml
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-07-22 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 7c1d58a41ffdb6baeab2f0f1255d6d5ea6c1d97e
Parents: 5df9bc1 61e28dc
Author: Josh Elser 
Authored: Fri Jul 22 15:18:53 2016 -0400
Committer: Josh Elser 
Committed: Fri Jul 22 15:18:53 2016 -0400

--
 .../accumulo/fate/zookeeper/ZooCache.java   | 36 
 1 file changed, 29 insertions(+), 7 deletions(-)
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-07-11 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 732bd2fcb73c8aed68aff8a2a415b02b6e0ea037
Parents: bf72905 24deb39
Author: Josh Elser 
Authored: Mon Jul 11 17:49:35 2016 -0400
Committer: Josh Elser 
Committed: Mon Jul 11 17:49:35 2016 -0400

--
 .../test/replication/ReplicationIT.java | 75 ++--
 1 file changed, 22 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/732bd2fc/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
--

[6/6] accumulo git commit: Merge branch '1.8'

2016-07-11 Thread elserj

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: bf7290546a4c720e9ba2d40498d653bc54b12741
Parents: ad6e981 4c4ad86
Author: Josh Elser 
Authored: Mon Jul 11 16:40:17 2016 -0400
Committer: Josh Elser 
Committed: Mon Jul 11 16:40:17 2016 -0400

--
 shell/src/main/java/org/apache/accumulo/shell/Shell.java | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/bf729054/shell/src/main/java/org/apache/accumulo/shell/Shell.java
--
diff --cc shell/src/main/java/org/apache/accumulo/shell/Shell.java
index 9f4b4b64,053e998..2300d9e
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@@ -442,22 -448,28 +443,24 @@@ public class Shell extends ShellOption
protected void setInstance(ShellOptionsJC options) {
  // should only be one set of instance options set
  instance = null;
 -if (options.isFake()) {
 -  instance = DeprecationUtil.makeMockInstance("fake");
 +String instanceName, hosts;
 +if (options.isHdfsZooInstance()) {
 +  instanceName = hosts = null;
 +} else if (options.getZooKeeperInstance().size() > 0) {
 +  List zkOpts = options.getZooKeeperInstance();
 +  instanceName = zkOpts.get(0);
 +  hosts = zkOpts.get(1);
  } else {
 -  String instanceName, hosts;
 -  if (options.isHdfsZooInstance()) {
 -instanceName = hosts = null;
 -  } else if (options.getZooKeeperInstance().size() > 0) {
 -List zkOpts = options.getZooKeeperInstance();
 -instanceName = zkOpts.get(0);
 -hosts = zkOpts.get(1);
 -  } else {
 -instanceName = options.getZooKeeperInstanceName();
 -hosts = options.getZooKeeperHosts();
 -  }
 -  final ClientConfiguration clientConf;
 -  try {
 -clientConf = options.getClientConfiguration();
 -  } catch (ConfigurationException | FileNotFoundException e) {
 -throw new IllegalArgumentException("Unable to load client config from 
" + options.getClientConfigFile(), e);
 -  }
 -  instance = getZooInstance(instanceName, hosts, clientConf);
 +  instanceName = options.getZooKeeperInstanceName();
 +  hosts = options.getZooKeeperHosts();
 +}
++final ClientConfiguration clientConf;
 +try {
-   instance = getZooInstance(instanceName, hosts, 
options.getClientConfiguration());
- } catch (Exception e) {
++  clientConf = options.getClientConfiguration();
++} catch (ConfigurationException | FileNotFoundException e) {
 +  throw new IllegalArgumentException("Unable to load client config from " 
+ options.getClientConfigFile(), e);
  }
++instance = getZooInstance(instanceName, hosts, clientConf);
}
  
/**

[6/6] accumulo git commit: Merge branch '1.8'

2016-06-17 Thread busbey

Merge branch '1.8'

 Conflicts:
README.md


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

Branch: refs/heads/master
Commit: 04579f6106cfe6062025dc72044acd6ea3d68683
Parents: 2b5b54b e811851
Author: Sean Busbey 
Authored: Fri Jun 17 15:57:22 2016 -0500
Committer: Sean Busbey 
Committed: Fri Jun 17 15:57:22 2016 -0500

--
 NOTICE| 30 --
 README.md | 32 
 2 files changed, 32 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/04579f61/README.md
--
diff --cc README.md
index f575b94,f56527b..4269001
--- a/README.md
+++ b/README.md
@@@ -97,30 -95,53 +97,62 @@@ import\s+org\.apache\.accumulo\.(.*\.(i
  
  The Accumulo project maintains binary compatibility across this API within a
  major release, as defined in the Java Language Specification 3rd ed. Starting
 -with Accumulo 1.6.2 and 1.7.0 all API changes will follow [semver 2.0][12]
 +with Accumulo 1.6.2 and 1.7.0 all API changes will follow [semver 2.0][semver]
  
+ Export Control
+ --
+ 
+ This distribution includes cryptographic software. The country in which you
+ currently reside may have restrictions on the import, possession, use, and/or
+ re-export to another country, of encryption software. BEFORE using any
+ encryption software, please check your country's laws, regulations and
+ policies concerning the import, possession, or use, and re-export of 
encryption
+ software, to see if this is permitted. See  for 
more
+ information.
+ 
+ The U.S. Government Department of Commerce, Bureau of Industry and Security
+ (BIS), has classified this software as Export Commodity Control Number (ECCN)
+ 5D002.C.1, which includes information security software using or performing
+ cryptographic functions with asymmetric algorithms. The form and manner of 
this
+ Apache Software Foundation distribution makes it eligible for export under the
+ License Exception ENC Technology Software Unrestricted (TSU) exception (see 
the
+ BIS Export Administration Regulations, Section 740.13) for both object code 
and
+ source code.
+ 
+ The following provides more details on the included cryptographic software:
+ 
+ Apache Accumulo uses the built-in java cryptography libraries in its RFile
+ encryption implementation. See [oracle's export-regulations doc][java-export]
+ for more details for on Java's cryptography features. Apache Accumulo also 
uses
+ the bouncycastle library for some crypographic technology as well. See
+ [the BouncyCastle FAQ][bouncy-faq] for
+ more details on bouncycastle's cryptography features.
+ 
+ 
 -[1]: http://accumulo.apache.org
 -[2]: INSTALL.md
 -[3]: TESTING.md
 -[4]: https://research.google.com/archive/bigtable.html
 -[5]: https://hadoop.apache.org
 -[6]: https://zookeeper.apache.org
 -[7]: https://thrift.apache.org
 -[8]: https://accumulo.apache.org/notable_features
 -[9]: https://maven.apache.org
 -[10]: https://accumulo.apache.org/latest/accumulo_user_manual
 -[11]: https://accumulo.apache.org/latest/examples
 -[12]: http://semver.org/spec/v2.0.0
 -[13]: http://checkstyle.sourceforge.net/config_regexp.html
 -[14]: examples/simple/src/main/java/org/apache/accumulo/examples/simple
 -[15]: docs/src/main/resources/examples
 -[16]: docs/src/main/asciidoc
 +[accumulo]: https://accumulo.apache.org
 +[logo]: contrib/accumulo-logo.png
 +[install]: INSTALL.md
 +[test]: TESTING.md
 +[BigTable]: https://research.google.com/archive/bigtable.html
 +[Hadoop]: https://hadoop.apache.org
 +[Zookeeper]: https://zookeeper.apache.org
 +[Thrift]: https://thrift.apache.org
 +[features]: https://accumulo.apache.org/notable_features
 +[Maven]: https://maven.apache.org
 +[man-web]: https://accumulo.apache.org/latest/accumulo_user_manual
 +[ex-web]: https://accumulo.apache.org/latest/examples
 +[semver]: http://semver.org/spec/v2.0.0
 +[regex]: http://checkstyle.sourceforge.net/config_regexp.html
 +[ex-src]: examples/simple/src/main/java/org/apache/accumulo/examples/simple
 +[rm-src]: docs/src/main/resources/examples
 +[man-src]: docs/src/main/asciidoc
 +[li]: https://img.shields.io/badge/license-ASL-blue.svg
 +[ll]: https://www.apache.org/licenses/LICENSE-2.0
 +[mi]: 
https://maven-badges.herokuapp.com/maven-central/org.apache.accumulo/accumulo-core/badge.svg
 +[ml]: 
https://maven-badges.herokuapp.com/maven-central/org.apache.accumulo/accumulo-core/
 +[ji]: 
https://javadoc-emblem.rhcloud.com/doc/org.apache.accumulo/accumulo-core/badge.svg
 +[jl]:

[6/6] accumulo git commit: Merge branch '1.8'

2016-05-09 Thread ctubbsii

Merge branch '1.8'

Conflicts:
shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java


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

Branch: refs/heads/master
Commit: 8e789f61d49675231d9188fde53e3ff77e4d7ffc
Parents: 7c812c3 9dec120
Author: Christopher Tubbs 
Authored: Mon May 9 18:44:09 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon May 9 18:44:09 2016 -0400

--
 .../test/java/org/apache/accumulo/shell/ShellUtilTest.java| 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8e789f61/shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java
--
diff --cc shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java
index d72477c,28e56ab..00b5205
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java
@@@ -40,7 -40,7 +40,8 @@@ public class ShellUtilTest 
  
// String with 3 lines, with one empty line
private static final String FILEDATA = "line1\n\nline2";
-   private static final String B64_FILEDATA = "bGluZTE=\n\nbGluZTI=";
 -  private static final String B64_FILEDATA = 
Base64.encodeBase64String("line1".getBytes(UTF_8)) + "\n\n" + 
Base64.encodeBase64String("line2".getBytes(UTF_8));
++  private static final String B64_FILEDATA = 
Base64.getEncoder().encodeToString("line1".getBytes(UTF_8)) + "\n\n"
++  + Base64.getEncoder().encodeToString("line2".getBytes(UTF_8));
  
@Test
public void testWithoutDecode() throws IOException {

48 matches

Mail list logo