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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 5848671987ef561d893339f2b4980d76a58df721
Parents: 5da9a3a 647f128
Author: Josh Elser 
Authored: Mon Aug 7 17:25:37 2017 -0400
Committer: Josh Elser 
Committed: Mon Aug 7 17:25:37 2017 -0400

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

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 591ba9f9014556bdf08d716d7c0b0d87e6742060
Parents: 0ee13f2 bf7bbb5
Author: Christopher Tubbs 
Authored: Tue Aug 1 20:13:28 2017 -0400
Committer: Christopher Tubbs 
Committed: Tue Aug 1 20:13:28 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/591ba9f9/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
--

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 0ee13f25cc56b3ca92449f840065ee2eef34c113
Parents: 67f5e95 7619532
Author: Josh Elser 
Authored: Mon Jul 31 15:55:13 2017 -0400
Committer: Josh Elser 
Committed: Mon Jul 31 15:55:13 2017 -0400

--

--

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 67f5e95d808bc8b9a41c38925e366f78a2759022
Parents: a205559 a1b3955
Author: Christopher Tubbs 
Authored: Fri Jul 28 18:07:21 2017 -0400
Committer: Christopher Tubbs 
Committed: Fri Jul 28 18:07:21 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(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/67f5e95d/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/67f5e95d/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
index 3f76594,000..39764cd
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
@@@ -1,220 -1,0 +1,220 @@@
 +/*
 + * 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.test.functional;
 +
 +import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Random;
 +import java.util.TreeSet;
 +import java.util.concurrent.TimeUnit;
 +
 +import org.apache.accumulo.core.client.BatchWriter;
 +import org.apache.accumulo.core.client.BatchWriterConfig;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Mutation;
 +import org.apache.accumulo.core.data.Range;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.harness.AccumuloClusterHarness;
 +import org.apache.accumulo.minicluster.MemoryUnit;
 +import org.apache.accumulo.minicluster.ServerType;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 +import org.apache.accumulo.test.TestIngest;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.io.Text;
 +import org.junit.After;
 +import org.junit.Assert;
 +import org.junit.Before;
 +import org.junit.Test;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +public class LargeRowIT extends AccumuloClusterHarness {
 +  private static final Logger log = LoggerFactory.getLogger(LargeRowIT.class);
 +
 +  @Override
 +  public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
 +cfg.setMemory(ServerType.TABLET_SERVER, 
cfg.getMemory(ServerType.TABLET_SERVER) * 2, MemoryUnit.BYTE);
 +Map siteConfig = cfg.getSiteConfig();
 +siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "10ms");
 +cfg.setSiteConfig(siteConfig);
 +  }
 +
 +  @Override
 +  protected int defaultTimeoutSeconds() {
 +return 4 * 60;
 +  }
 +
 +  private static final int SEED = 42;
 +  private static final int NUM_ROWS = 100;
 +  private static final int ROW_SIZE = 1 << 17;
 +  private static final int NUM_PRE_SPLITS = 9;
 +  private static final int SPLIT_THRESH = ROW_SIZE * NUM_ROWS / 
NUM_PRE_SPLITS;
 +
 +  private String 

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: a205559dd3609d5aa8c4161877fd182d9581829f
Parents: 3f01418 f88f5cf
Author: Christopher Tubbs 
Authored: Thu Jul 27 20:11:32 2017 -0400
Committer: Christopher Tubbs 
Committed: Thu Jul 27 20:11:32 2017 -0400

--
 .../org/apache/accumulo/core/client/impl/ThriftScanner.java| 1 -
 .../accumulo/core/iterators/system/LocalityGroupIterator.java  | 4 ++--
 .../accumulo/core/iterators/system/ColumnFilterTest.java   | 6 +++---
 .../server/master/balancer/HostRegexTableLoadBalancer.java | 6 +++---
 .../org/apache/accumulo/server/security/UserImpersonation.java | 1 -
 .../master/balancer/BaseHostRegexTableLoadBalancerTest.java| 4 ++--
 .../server/master/balancer/HostRegexTableLoadBalancerTest.java | 6 +++---
 .../src/main/java/org/apache/accumulo/master/Master.java   | 2 +-
 .../org/apache/accumulo/test/BalanceWithOfflineTableIT.java| 1 -
 .../apache/accumulo/test/functional/FunctionalTestUtils.java   | 2 +-
 10 files changed, 15 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a205559d/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 fc3be57,bdf381d..be98327
--- 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
@@@ -162,15 -152,16 +162,14 @@@ public class ThriftScanner 
  
  Map> serverSideIteratorOptions;
  
 -public ScanState(ClientContext context, Text tableId, Authorizations 
authorizations, Range range, SortedSet fetchedColumns, int size,
 -List serverSideIteratorList, Map> 
serverSideIteratorOptions, boolean isolated) {
 -  this(context, tableId, authorizations, range, fetchedColumns, size, 
serverSideIteratorList, serverSideIteratorOptions, isolated,
 -  Constants.SCANNER_DEFAULT_READAHEAD_THRESHOLD);
 -}
 +SamplerConfiguration samplerConfig;
  
 -public ScanState(ClientContext context, Text tableId, Authorizations 
authorizations, Range range, SortedSet fetchedColumns, int size,
 -List serverSideIteratorList, Map> 
serverSideIteratorOptions, boolean isolated, long readaheadThreshold) {
 +public ScanState(ClientContext context, String tableId, Authorizations 
authorizations, Range range, SortedSet fetchedColumns, int size,
 +List serverSideIteratorList, Map> 
serverSideIteratorOptions, boolean isolated, long readaheadThreshold,
 +SamplerConfiguration samplerConfig, long batchTimeOut, String 
classLoaderContext) {
this.context = context;
- 
this.authorizations = authorizations;
 +  this.classLoaderContext = classLoaderContext;
  
columns = new ArrayList<>(fetchedColumns.size());
for (Column column : fetchedColumns) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a205559d/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
index dba3a32,ac8355b..e1cd610
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
@@@ -70,69 -65,14 +70,69 @@@ public class LocalityGroupIterator exte
  private InterruptibleIterator iterator;
}
  
 -  private LocalityGroup groups[];
 -  private Set nonDefaultColumnFamilies;
 +  public static class LocalityGroupContext {
 +final List groups;
 +final LocalityGroup defaultGroup;
 +final Map groupByCf;
 +
 +public LocalityGroupContext(LocalityGroup[] groups) {
 +  this.groups = Collections.unmodifiableList(Arrays.asList(groups));
-   this.groupByCf = new HashMap();
++  this.groupByCf = new HashMap<>();
 +  LocalityGroup foundDefault = null;
 +
 +  for (LocalityGroup group : groups) {
 +if (group.isDefaultLocalityGroup && group.columnFamilies == null) {
 +  if (foundDefault != null) {
 +throw new IllegalStateException("Found multiple default locality 
groups");
 +  

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 3f01418e6ae134ef707f333088ee2ba0902b4a2d
Parents: 018c7fe f08c58c
Author: Josh Elser 
Authored: Thu Jul 27 19:01:08 2017 -0400
Committer: Josh Elser 
Committed: Thu Jul 27 19:02:10 2017 -0400

--
 .../file/streams/BoundedRangeFileInputStream.java   | 16 +---
 .../java/org/apache/accumulo/core/util/Jar.java |  3 +--
 .../accumulo/monitor/servlets/BasicServlet.java | 10 +-
 .../accumulo/monitor/servlets/DefaultServlet.java   |  6 +-
 .../accumulo/monitor/servlets/OperationServlet.java | 15 ++-
 5 files changed, 26 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3f01418e/core/src/main/java/org/apache/accumulo/core/file/streams/BoundedRangeFileInputStream.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/file/streams/BoundedRangeFileInputStream.java
index a033ad4,000..95ef4ea
mode 100644,00..100644
--- 
a/core/src/main/java/org/apache/accumulo/core/file/streams/BoundedRangeFileInputStream.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/file/streams/BoundedRangeFileInputStream.java
@@@ -1,157 -1,0 +1,143 @@@
 +/*
 + * 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.file.streams;
 +
 +import java.io.IOException;
 +import java.io.InputStream;
- import java.security.AccessController;
- import java.security.PrivilegedActionException;
- import java.security.PrivilegedExceptionAction;
 +
 +import org.apache.hadoop.fs.Seekable;
 +
 +/**
 + * BoundedRangeFIleInputStream abstracts a contiguous region of a Hadoop 
FSDataInputStream as a regular input stream. One can create multiple
 + * BoundedRangeFileInputStream on top of the same FSDataInputStream and they 
would not interfere with each other.
 + */
 +public class BoundedRangeFileInputStream extends InputStream {
 +
 +  private volatile boolean closed = false;
 +  private final InputStream in;
 +  private long pos;
 +  private long end;
 +  private long mark;
 +  private final byte[] oneByte = new byte[1];
 +
 +  /**
 +   * Constructor
 +   *
 +   * @param in
 +   *  The FSDataInputStream we connect to.
 +   * @param offset
 +   *  Beginning offset of the region.
 +   * @param length
 +   *  Length of the region.
 +   *
 +   *  The actual length of the region may be smaller if (off_begin + 
length) goes beyond the end of FS input stream.
 +   */
 +  public  
BoundedRangeFileInputStream(StreamType in, long offset, long length) {
 +if (offset < 0 || length < 0) {
 +  throw new IndexOutOfBoundsException("Invalid offset/length: " + offset 
+ "/" + length);
 +}
 +
 +this.in = in;
 +this.pos = offset;
 +this.end = offset + length;
 +this.mark = -1;
 +  }
 +
 +  @Override
 +  public int available() throws IOException {
 +return (int) (end - pos);
 +  }
 +
 +  @Override
 +  public int read() throws IOException {
 +int ret = read(oneByte);
 +if (ret == 1)
 +  return oneByte[0] & 0xff;
 +return -1;
 +  }
 +
 +  @Override
 +  public int read(byte[] b) throws IOException {
 +return read(b, 0, b.length);
 +  }
 +
 +  @Override
 +  public int read(final byte[] b, final int off, int len) throws IOException {
 +if ((off | len | (off + len) | (b.length - (off + len))) < 0) {
 +  throw new IndexOutOfBoundsException();
 +}
 +
 +final int n = (int) Math.min(Integer.MAX_VALUE, Math.min(len, (end - 
pos)));
 +if (n == 0)
 +  return -1;
 +Integer ret = 0;
 +synchronized (in) {
 +  // ensuring we are not closed which would be followed by someone else 
reusing the decompressor
 +  if (closed) {
 + 

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 6b139768122103aa2d7c315572da3b7852a483c7
Parents: d38685c efc5a98
Author: Josh Elser 
Authored: Mon Jun 26 17:47:22 2017 -0400
Committer: Josh Elser 
Committed: Mon Jun 26 17:47:22 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(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b139768/core/src/main/java/org/apache/accumulo/core/client/security/tokens/KerberosToken.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/security/tokens/KerberosToken.java
index 1a4869d,5bcab1a..93e1242
--- 
a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/KerberosToken.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/KerberosToken.java
@@@ -82,22 -69,14 +83,16 @@@ public class KerberosToken implements A
 *  A keytab file
 * @param replaceCurrentUser
 *  Should the current Hadoop user be replaced with this user
 +   * @deprecated since 1.8.0, @see #KerberosToken(String, File)
 */
 +  @Deprecated
public KerberosToken(String principal, File keytab, boolean 
replaceCurrentUser) throws IOException {
- requireNonNull(principal, "Principal was null");
- requireNonNull(keytab, "Keytab was null");
+ this.principal = requireNonNull(principal, "Principal was null");
+ this.keytab = requireNonNull(keytab, "Keytab was null");
  checkArgument(keytab.exists() && keytab.isFile(), "Keytab was not a 
normal file");
- UserGroupInformation ugi;
  if (replaceCurrentUser) {
UserGroupInformation.loginUserFromKeytab(principal, 
keytab.getAbsolutePath());
-   ugi = UserGroupInformation.getCurrentUser();
- } else {
-   ugi = UserGroupInformation.loginUserFromKeytabAndReturnUGI(principal, 
keytab.getAbsolutePath());
  }
- this.principal = ugi.getUserName();
- this.keytab = keytab;
}
  
/**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b139768/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
index 59a6762,000..562f46f
mode 100644,00..100644
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
@@@ -1,485 -1,0 +1,588 @@@
 +/*
 + * 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.test.functional;
 +
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertFalse;
 +import static org.junit.Assert.assertTrue;
 +
 +import java.io.File;
 +import java.io.FileWriter;
 +import java.io.IOException;
 +import java.net.ConnectException;
 +import java.net.InetAddress;
 +import java.nio.ByteBuffer;
++import java.security.PrivilegedExceptionAction;
 +import java.util.Collections;
 +import java.util.HashMap;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Properties;
 +
 +import org.apache.accumulo.cluster.ClusterUser;
++import org.apache.accumulo.core.client.Connector;
++import org.apache.accumulo.core.client.Scanner;
++import org.apache.accumulo.core.client.ZooKeeperInstance;
 +import org.apache.accumulo.core.client.security.tokens.KerberosToken;
 +import 

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 15055b49de305f07fd131aa20f6f3b3e9dc7d4b7
Parents: a351610 f630f6a
Author: Josh Elser 
Authored: Wed Jun 21 12:21:24 2017 -0400
Committer: Josh Elser 
Committed: Wed Jun 21 12:21:24 2017 -0400

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

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: a351610eaba120854d9c3c5784e22f8dd2715461
Parents: 97c70da 6f18782
Author: Josh Elser 
Authored: Wed Jun 21 11:03:08 2017 -0400
Committer: Josh Elser 
Committed: Wed Jun 21 11:03:08 2017 -0400

--
 .../main/asciidoc/chapters/administration.txt   |  5 ++
 server/monitor/pom.xml  |  5 ++
 .../accumulo/monitor/servlets/trace/Basic.java  |  2 +-
 .../monitor/servlets/trace/BasicTest.java   | 55 
 4 files changed, 66 insertions(+), 1 deletion(-)
--


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

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

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

[mwalch]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 2b72e7c96dec1723c969ee04fca6d29c6e3140a4
Parents: 3a00511 d1591f0
Author: Mike Walch 
Authored: Tue Jun 13 15:42:53 2017 -0400
Committer: Mike Walch 
Committed: Tue Jun 13 15:42:53 2017 -0400

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

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 3a005113a58ef15f5f49863aa48823c4c4c352ee
Parents: d99158f 94bb593
Author: Christopher Tubbs 
Authored: Mon Jun 12 22:41:08 2017 -0400
Committer: Christopher Tubbs 
Committed: Mon Jun 12 22:41:08 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/3a005113/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
--

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: da695f60483b4f1fd9e8082c0a5f84e9a7350e90
Parents: 116da38 4effd0e
Author: Christopher Tubbs 
Authored: Thu Jun 8 22:03:13 2017 -0400
Committer: Christopher Tubbs 
Committed: Thu Jun 8 22:03:13 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/da695f60/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da695f60/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da695f60/shell/src/main/java/org/apache/accumulo/shell/Shell.java
--
diff --cc shell/src/main/java/org/apache/accumulo/shell/Shell.java
index 3e838e0,cdd177e..05d85cf
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@@ -53,8 -53,8 +53,7 @@@ import org.apache.accumulo.core.client.
  import org.apache.accumulo.core.client.NamespaceNotFoundException;
  import org.apache.accumulo.core.client.TableNotFoundException;
  import org.apache.accumulo.core.client.ZooKeeperInstance;
- import org.apache.accumulo.core.client.impl.ClientContext;
  import org.apache.accumulo.core.client.impl.Tables;
 -import org.apache.accumulo.core.client.mock.MockInstance;
  import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
  import org.apache.accumulo.core.client.security.tokens.PasswordToken;
  import org.apache.accumulo.core.conf.AccumuloConfiguration;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da695f60/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da695f60/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
--
diff --cc 
shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
index 88eeefd,94b83fc..9f8ee09
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
@@@ -30,15 -26,11 +30,14 @@@ import java.util.Set
  import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.client.Instance;
  import org.apache.accumulo.core.conf.AccumuloConfiguration;
- import org.apache.accumulo.core.conf.DefaultConfiguration;
  import org.apache.accumulo.core.conf.Property;
  import org.apache.accumulo.core.conf.SiteConfiguration;
 +import org.apache.accumulo.core.util.Base64;
  import org.apache.accumulo.core.zookeeper.ZooUtil;
  import org.apache.accumulo.fate.AdminUtil;
 +import org.apache.accumulo.fate.ReadOnlyRepo;
  import org.apache.accumulo.fate.ReadOnlyTStore.TStatus;
 +import org.apache.accumulo.fate.Repo;
  import org.apache.accumulo.fate.ZooStore;
  import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
  import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da695f60/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
index 95042d2,000..a49e1cd
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
+++ b/test/src/main/java/org/apache/accumulo/test/util/CertUtils.java
@@@ -1,348 -1,0 +1,348 @@@
 +/*
 + * 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 

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: c093b561d60fb6877ca6a09820d764803ba41c42
Parents: cae0790 5f6882f
Author: Josh Elser 
Authored: Wed May 3 17:07:33 2017 -0400
Committer: Josh Elser 
Committed: Wed May 3 17:07:33 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/c093b561/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c093b561/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
--

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: bca75d356cbec38a21b8ca7926ca356abfae0c70
Parents: cf6c0ff ddc6203
Author: Josh Elser 
Authored: Thu Apr 20 22:44:00 2017 -0400
Committer: Josh Elser 
Committed: Thu Apr 20 22:44:00 2017 -0400

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


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

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 0f13792eeb5a6553d50ca9f1fa48722504447a08
Parents: ba3dea1 5ac1574
Author: Josh Elser 
Authored: Thu Apr 13 12:43:00 2017 -0400
Committer: Josh Elser 
Committed: Thu Apr 13 12:48:36 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f13792e/test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
index 000,000..e2cdbcd
new file mode 100644
--- /dev/null
+++ b/test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
@@@ -1,0 -1,0 +1,317 @@@
++/*
++ * 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.test;
++
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertFalse;
++import static org.junit.Assert.assertNotNull;
++import static org.junit.Assert.assertTrue;
++
++import java.util.Arrays;
++import java.util.Collections;
++import java.util.HashMap;
++import java.util.HashSet;
++import java.util.Iterator;
++import java.util.Map;
++import java.util.Map.Entry;
++import java.util.Set;
++import java.util.TreeSet;
++
++import org.apache.accumulo.core.client.BatchScanner;
++import org.apache.accumulo.core.client.BatchWriter;
++import org.apache.accumulo.core.client.BatchWriterConfig;
++import org.apache.accumulo.core.client.Connector;
++import org.apache.accumulo.core.client.IteratorSetting;
++import org.apache.accumulo.core.client.Scanner;
++import org.apache.accumulo.core.conf.Property;
++import org.apache.accumulo.core.data.Key;
++import org.apache.accumulo.core.data.Mutation;
++import org.apache.accumulo.core.data.PartialKey;
++import org.apache.accumulo.core.data.Range;
++import org.apache.accumulo.core.data.Value;
++import org.apache.accumulo.core.iterators.OrIterator;
++import org.apache.accumulo.core.security.Authorizations;
++import org.apache.accumulo.harness.AccumuloClusterHarness;
++import org.apache.hadoop.io.Text;
++import org.junit.Test;
++
++public class OrIteratorIT extends AccumuloClusterHarness {
++  private static final String EMPTY = "";
++
++  @Override
++  public int defaultTimeoutSeconds() {
++return 60;
++  }
++
++  @Test
++  public void testMultipleRowsInTablet() throws Exception {
++final Connector conn = getConnector();
++final String tableName = getUniqueNames(1)[0];
++conn.tableOperations().create(tableName);
++
++try (BatchWriter bw = conn.createBatchWriter(tableName, new 
BatchWriterConfig())) {
++  Mutation m = new Mutation("row1");
++  m.put("bob", "2", EMPTY);
++  m.put("frank", "3", EMPTY);
++  m.put("steve", "1", EMPTY);
++  bw.addMutation(m);
++
++  m = new Mutation("row2");
++  m.put("bob", "7", EMPTY);
++  m.put("eddie", "4", EMPTY);
++  m.put("mort", "6", EMPTY);
++  m.put("zed", "5", EMPTY);
++  bw.addMutation(m);
++}
++
++IteratorSetting is = new IteratorSetting(50, OrIterator.class);
++is.addOption(OrIterator.COLUMNS_KEY, "mort,frank");
++Map expectedData = new HashMap<>();
++expectedData.put("frank", "3");
++expectedData.put("mort", "6");
++
++try (BatchScanner bs = conn.createBatchScanner(tableName, 
Authorizations.EMPTY, 1)) {
++  Set ranges = new HashSet<>(Arrays.asList(Range.exact("row1"), 
Range.exact("row2")));
++  bs.setRanges(ranges);
++  bs.addScanIterator(is);
++  for (Entry entry : bs) {
++String term = 

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 8d6b7299e4b3ee9b593f1b75d78164088c7402ae
Parents: 7f865d2 4ba5faf
Author: Christopher Tubbs 
Authored: Mon Mar 27 19:47:46 2017 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 27 19:47:46 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/8d6b7299/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 3430da2d6cd50c1dce150c235f8f80620f7fbcc5
Parents: e86fabb c3a0d1d
Author: Christopher Tubbs 
Authored: Wed Feb 22 14:21:34 2017 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 22 14:21:34 2017 -0500

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

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 2a0375add0787e4e34cd98711d0f2e735240f2b3
Parents: 6f4c9fe 4ea66d4
Author: Josh Elser 
Authored: Tue Jan 17 16:38:14 2017 -0500
Committer: Josh Elser 
Committed: Tue Jan 17 16:38:14 2017 -0500

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

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

[ctubbsii]

Merge branch '1.7' into 1.8

Conflicts:
shell/src/main/java/org/apache/accumulo/shell/commands/GrepCommand.java
shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java


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

Branch: refs/heads/master
Commit: 4cc53bb1251f5b2b722a3050c2d4f55945183c9b
Parents: da47fb2 c3d8703
Author: Christopher Tubbs 
Authored: Mon Jan 9 18:14:23 2017 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 9 18:14:23 2017 -0500

--
 .../java/org/apache/accumulo/shell/Shell.java   |  2 +-
 .../accumulo/shell/commands/GrepCommand.java| 75 -
 .../accumulo/shell/commands/ScanCommand.java| 86 ++--
 3 files changed, 84 insertions(+), 79 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4cc53bb1/shell/src/main/java/org/apache/accumulo/shell/commands/GrepCommand.java
--
diff --cc 
shell/src/main/java/org/apache/accumulo/shell/commands/GrepCommand.java
index 70c5db2,6d20790..6b69bae
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/GrepCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/GrepCommand.java
@@@ -39,43 -39,40 +39,44 @@@ public class GrepCommand extends ScanCo
  
@Override
public int execute(final String fullCommand, final CommandLine cl, final 
Shell shellState) throws Exception {
- final PrintFile printFile = getOutputFile(cl);
+ try (final PrintFile printFile = getOutputFile(cl)) {
  
- final String tableName = OptUtil.getTableOpt(cl, shellState);
+   final String tableName = OptUtil.getTableOpt(cl, shellState);
  
- if (cl.getArgList().isEmpty()) {
-   throw new MissingArgumentException("No terms specified");
- }
- final Class formatter = getFormatter(cl, tableName, 
shellState);
- final ScanInterpreter interpeter = getInterpreter(cl, tableName, 
shellState);
+   if (cl.getArgList().isEmpty()) {
+ throw new MissingArgumentException("No terms specified");
+   }
+   final Class formatter = getFormatter(cl, 
tableName, shellState);
+   final ScanInterpreter interpeter = getInterpreter(cl, tableName, 
shellState);
  
- // handle first argument, if present, the authorizations list to
- // scan with
- int numThreads = 20;
- if (cl.hasOption(numThreadsOpt.getOpt())) {
-   numThreads = 
Integer.parseInt(cl.getOptionValue(numThreadsOpt.getOpt()));
- }
- final Authorizations auths = getAuths(cl, shellState);
- final BatchScanner scanner = 
shellState.getConnector().createBatchScanner(tableName, auths, numThreads);
- scanner.setRanges(Collections.singletonList(getRange(cl, interpeter)));
+   // handle first argument, if present, the authorizations list to
+   // scan with
+   int numThreads = 20;
+   if (cl.hasOption(numThreadsOpt.getOpt())) {
+ numThreads = 
Integer.parseInt(cl.getOptionValue(numThreadsOpt.getOpt()));
+   }
+   final Authorizations auths = getAuths(cl, shellState);
+   final BatchScanner scanner = 
shellState.getConnector().createBatchScanner(tableName, auths, numThreads);
+   scanner.setRanges(Collections.singletonList(getRange(cl, interpeter)));
  
- scanner.setTimeout(getTimeout(cl), TimeUnit.MILLISECONDS);
+   scanner.setTimeout(getTimeout(cl), TimeUnit.MILLISECONDS);
  
- setupSampling(tableName, cl, shellState, scanner);
++  setupSampling(tableName, cl, shellState, scanner);
 +
- for (int i = 0; i < cl.getArgs().length; i++) {
-   setUpIterator(Integer.MAX_VALUE - cl.getArgs().length + i, "grep" + i, 
cl.getArgs()[i], scanner, cl);
- }
- try {
-   // handle columns
-   fetchColumns(cl, scanner, interpeter);
+   for (int i = 0; i < cl.getArgs().length; i++) {
+ setUpIterator(Integer.MAX_VALUE - cl.getArgs().length + i, "grep" + 
i, cl.getArgs()[i], scanner, cl);
+   }
+   try {
+ // handle columns
+ fetchColumns(cl, scanner, interpeter);
  
-   // output the records
-   final FormatterConfig config = new FormatterConfig();
-   config.setPrintTimestamps(cl.hasOption(timestampOpt.getOpt()));
-   printRecords(cl, shellState, config, scanner, formatter, printFile);
- } finally {
-   scanner.close();
+ // output the records
 -printRecords(cl, 

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: da47fb2107acf42e0398cfb5bf1c2cbb5aa586d7
Parents: f289ae2 62c31b5
Author: Christopher Tubbs 
Authored: Mon Jan 9 17:28:06 2017 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 9 17:28:06 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(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/da47fb21/assemble/src/main/resources/NOTICE
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da47fb21/docs/src/main/asciidoc/accumulo_user_manual.asciidoc
--

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 5a11a021f65330e316699f42a6df7eba3b63cd53
Parents: 037c138 3bd701b
Author: Josh Elser 
Authored: Sun Dec 11 16:16:06 2016 -0500
Committer: Josh Elser 
Committed: Sun Dec 11 16:16:06 2016 -0500

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

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

[busbey]

Merge branch '1.7' into 1.8

 Conflicts:
server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java


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

Branch: refs/heads/master
Commit: 037c1384ac861be95d8c9d1c5d1acbf61e40e2fe
Parents: 7c7bbab 47b57f7
Author: Sean Busbey 
Authored: Fri Dec 9 15:33:37 2016 -0600
Committer: Sean Busbey 
Committed: Fri Dec 9 15:33:37 2016 -0600

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/037c1384/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
--
diff --cc 
server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 2b6bcbf,67bd9d5..7c0d9b2
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@@ -183,7 -185,36 +187,49 @@@ public class TraceServer implements Wat
  log.info("Version " + Constants.VERSION);
  log.info("Instance " + serverConfiguration.getInstance().getInstanceID());
  AccumuloConfiguration conf = serverConfiguration.getConfiguration();
 -table = conf.get(Property.TRACE_TABLE);
 +tableName = conf.get(Property.TRACE_TABLE);
+ connector = ensureTraceTableExists(conf);
+ 
 -int port = conf.getPort(Property.TRACE_PORT);
 -final ServerSocket sock = ServerSocketChannel.open().socket();
 -sock.setReuseAddress(true);
 -sock.bind(new InetSocketAddress(hostname, port));
++int ports[] = conf.getPort(Property.TRACE_PORT);
++ServerSocket sock = null;
++for (int port : ports) {
++  ServerSocket s = ServerSocketChannel.open().socket();
++  s.setReuseAddress(true);
++  try {
++s.bind(new InetSocketAddress(hostname, port));
++sock = s;
++break;
++  } catch (Exception e) {
++log.warn("Unable to start trace server on port {}", port);
++  }
++}
++if (null == sock) {
++  throw new RuntimeException("Unable to start trace server on configured 
ports: " + Arrays.toString(ports));
++}
+ final TServerTransport transport = new TServerSocket(sock);
+ TThreadPoolServer.Args options = new TThreadPoolServer.Args(transport);
+ options.processor(new Processor(new Receiver()));
+ server = new TThreadPoolServer(options);
+ registerInZooKeeper(sock.getInetAddress().getHostAddress() + ":" + 
sock.getLocalPort(), conf.get(Property.TRACE_ZK_PATH));
 -writer = new AtomicReference<>(this.connector.createBatchWriter(table, 
new BatchWriterConfig().setMaxLatency(BATCH_WRITER_MAX_LATENCY, 
TimeUnit.SECONDS)));
++writer = new AtomicReference<>(this.connector.createBatchWriter(tableName,
++new BatchWriterConfig().setMaxLatency(BATCH_WRITER_MAX_LATENCY, 
TimeUnit.SECONDS)));
+   }
+ 
+   /**
+* Exceptions thrown out of here should be things that cause service 
failure (e.g. misconfigurations that aren't likely to change on retry).
+*
+* @return a working Connection that can be reused
+* @throws ClassNotFoundException
+*   if TRACE_TOKEN_TYPE is set to a class that we can't load.
+* @throws InstantiationException
+*   if we fail to create an instance of TRACE_TOKEN_TYPE.
+* @throws IllegalAccessException
+*   if the class pointed to by TRACE_TOKEN_TYPE is private.
+* @throws AccumuloSecurityException
+*   if the trace user has the wrong permissions
+*/
+   private Connector ensureTraceTableExists(final AccumuloConfiguration conf) 
throws AccumuloSecurityException, ClassNotFoundException, 
InstantiationException,
+   IllegalAccessException {
  Connector connector = null;
  while (true) {
try {
@@@ -215,46 -246,20 +261,20 @@@
  }
  
  connector = serverConfiguration.getInstance().getConnector(principal, 
at);
 -if (!connector.tableOperations().exists(table)) {
 -  connector.tableOperations().create(table);
 +if (!connector.tableOperations().exists(tableName)) {
 +  connector.tableOperations().create(tableName);
IteratorSetting setting = new IteratorSetting(10, "ageoff", 
AgeOffFilter.class.getName());
AgeOffFilter.setTTL(setting, 7 * 24 * 60 * 60 * 1000l);
 -  connector.tableOperations().attachIterator(table, setting);
 +  connector.tableOperations().attachIterator(tableName, setting);
  }
 -

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

[busbey]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: c7431092e132e070c27e464b473100552255ba45
Parents: 9c11f72 0d41ec6
Author: Sean Busbey 
Authored: Mon Oct 17 14:41:50 2016 -0700
Committer: Sean Busbey 
Committed: Mon Oct 17 14:41:50 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c7431092/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
--

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 9c11f72e3a00b9e0fb888c37d46fb33935eb9304
Parents: 9803093 9e236f2
Author: Christopher Tubbs 
Authored: Fri Oct 14 17:44:18 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Oct 14 17:44:18 2016 -0400

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

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: f8fbf32bcb68ec5aa42a5b60b26715dbe755012e
Parents: d2a3f7f 8255fc0
Author: Josh Elser 
Authored: Sat Oct 8 16:50:13 2016 -0400
Committer: Josh Elser 
Committed: Sat Oct 8 16:50:13 2016 -0400

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

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

[busbey]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 91269bf318586d31756fc3aecc1d42a20e602f76
Parents: f7989c6 a17390d
Author: Sean Busbey 
Authored: Fri Oct 7 00:26:10 2016 -0500
Committer: Sean Busbey 
Committed: Fri Oct 7 00:26:10 2016 -0500

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

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 272ac28884af328ff04f342dcfe5a3bb74bc5bfe
Parents: 2270bee 52f53f5
Author: Christopher Tubbs 
Authored: Thu Sep 29 15:38:53 2016 -0400
Committer: Christopher Tubbs 
Committed: Thu Sep 29 15:38:53 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/272ac288/docs/pom.xml
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/272ac288/docs/src/main/asciidoc/accumulo_user_manual.asciidoc
--

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/272ac288/docs/src/main/resources/examples/README
--

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

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 2270beea674e177abf7887099686692b6823c31d
Parents: fdc3317 31590b8
Author: Josh Elser 
Authored: Wed Sep 28 23:36:20 2016 -0400
Committer: Josh Elser 
Committed: Wed Sep 28 23:36:20 2016 -0400

--

--

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 5a8669a47628e6a594ded10bed4ff30865098479
Parents: c369cdc 955200f
Author: Josh Elser 
Authored: Tue Sep 27 21:11:31 2016 -0400
Committer: Josh Elser 
Committed: Tue Sep 27 21:11:31 2016 -0400

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

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: a2ac4dd0b3a7926c46799dc55675658443c1236f
Parents: 38606a8 450cae5
Author: Josh Elser 
Authored: Tue Sep 27 15:27:52 2016 -0400
Committer: Josh Elser 
Committed: Tue Sep 27 15:46:56 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a2ac4dd0/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
index 9a72051,000..b3b24af
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
@@@ -1,173 -1,0 +1,183 @@@
 +/*
 + * 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.test;
 +
 +import static org.junit.Assert.assertTrue;
 +
 +import java.io.File;
 +import java.io.FileOutputStream;
 +import java.io.IOException;
 +import java.io.OutputStream;
 +import java.util.Collection;
 +import java.util.Map.Entry;
 +import java.util.Set;
- import java.util.concurrent.TimeUnit;
 +
++import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.BatchWriter;
 +import org.apache.accumulo.core.client.BatchWriterConfig;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
++import org.apache.accumulo.core.conf.DefaultConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Mutation;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.RootTable;
 +import org.apache.accumulo.core.security.Authorizations;
++import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
 +import org.apache.accumulo.minicluster.ServerType;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 +import org.apache.accumulo.minicluster.impl.ProcessReference;
++import org.apache.accumulo.server.util.AccumuloStatus;
++import org.apache.accumulo.server.zookeeper.ZooReaderWriterFactory;
 +import org.apache.accumulo.test.functional.ConfigurableMacBase;
 +import org.apache.commons.io.FileUtils;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.fs.RawLocalFileSystem;
 +import org.junit.Assert;
 +import org.junit.Test;
 +
 +import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 +
 +public class ExistingMacIT extends ConfigurableMacBase {
 +  @Override
 +  public int defaultTimeoutSeconds() {
 +return 2 * 60;
 +  }
 +
 +  @Override
 +  public void configure(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
 +cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "15s");
 +
 +// use raw local file system so walogs sync and flush will work
 +hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
 +  }
 +
 +  private void createEmptyConfig(File confFile) throws IOException {
 +Configuration conf = new Configuration(false);
 +OutputStream hcOut = new FileOutputStream(confFile);
 +conf.writeXml(hcOut);
 +hcOut.close();
 +  }
 +
 +  @Test
 +  public void testExistingInstance() throws Exception {
 +
 +Connector conn = getCluster().getConnector("root", new 
PasswordToken(ROOT_PASSWORD));
 +
 +

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

[busbey]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 38606a86e66830c0f5e8083311c062af4a5a42e4
Parents: c1dda77 e76f3a2
Author: Sean Busbey 
Authored: Mon Sep 26 10:55:12 2016 -0500
Committer: Sean Busbey 
Committed: Mon Sep 26 10:55:12 2016 -0500

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

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 33f730160e4b3624548c110f5eb9e9f45eb0d2dd
Parents: 6a677ad d23676d
Author: Josh Elser 
Authored: Fri Sep 23 10:24:54 2016 -0400
Committer: Josh Elser 
Committed: Fri Sep 23 10:24:54 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/33f73016/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
--

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

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 5df4f038fe61751333b93de86e8f8bb5ceaca74b
Parents: 4ce0338 e07f685
Author: Josh Elser 
Authored: Fri Sep 16 12:57:16 2016 -0400
Committer: Josh Elser 
Committed: Fri Sep 16 12:57:16 2016 -0400

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

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 8c85c32af5a0db509c9859ad8bc008cdb2d72892
Parents: 7dca4ab 4136bfa
Author: Christopher Tubbs 
Authored: Sat Sep 10 18:54:54 2016 -0400
Committer: Christopher Tubbs 
Committed: Sat Sep 10 18:54:54 2016 -0400

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

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: ba0f0d45b7e7bd42826d02f3cebfe91e6625
Parents: d3401dd 200be5f
Author: Christopher Tubbs 
Authored: Fri Sep 9 15:17:28 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Sep 9 15:17:28 2016 -0400

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

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: d3401dd87ccab696a040552fe649b4506619c68d
Parents: 31301c0 2be9231
Author: Josh Elser 
Authored: Fri Sep 9 15:05:40 2016 -0400
Committer: Josh Elser 
Committed: Fri Sep 9 15:05:40 2016 -0400

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

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 4bc75b1176d01182a9f5942b2c4bae65933eae5a
Parents: 5e53631 a226233
Author: Josh Elser 
Authored: Wed Aug 17 16:20:37 2016 -0400
Committer: Josh Elser 
Committed: Wed Aug 17 16:20:37 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bc75b11/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
index 8001a48,000..2337f91
mode 100644,00..100644
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
@@@ -1,423 -1,0 +1,482 @@@
 +/*
 + * 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.test.functional;
 +
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertTrue;
 +
 +import java.io.File;
 +import java.io.FileWriter;
 +import java.io.IOException;
 +import java.net.ConnectException;
 +import java.net.InetAddress;
 +import java.nio.ByteBuffer;
 +import java.util.Collections;
 +import java.util.HashMap;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Properties;
 +
 +import org.apache.accumulo.cluster.ClusterUser;
 +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.rpc.UGIAssumingTransport;
 +import org.apache.accumulo.harness.AccumuloITBase;
 +import org.apache.accumulo.harness.MiniClusterConfigurationCallback;
 +import org.apache.accumulo.harness.MiniClusterHarness;
 +import org.apache.accumulo.harness.TestingKdc;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 +import org.apache.accumulo.proxy.Proxy;
 +import org.apache.accumulo.proxy.ProxyServer;
 +import org.apache.accumulo.proxy.thrift.AccumuloProxy;
 +import org.apache.accumulo.proxy.thrift.AccumuloProxy.Client;
 +import org.apache.accumulo.proxy.thrift.AccumuloSecurityException;
 +import org.apache.accumulo.proxy.thrift.ColumnUpdate;
 +import org.apache.accumulo.proxy.thrift.Key;
 +import org.apache.accumulo.proxy.thrift.KeyValue;
 +import org.apache.accumulo.proxy.thrift.ScanOptions;
 +import org.apache.accumulo.proxy.thrift.ScanResult;
 +import org.apache.accumulo.proxy.thrift.TimeType;
 +import org.apache.accumulo.proxy.thrift.WriterOptions;
 +import org.apache.accumulo.server.util.PortUtils;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 +import org.apache.hadoop.security.UserGroupInformation;
 +import org.apache.thrift.protocol.TCompactProtocol;
 +import org.apache.thrift.transport.TSaslClientTransport;
 +import org.apache.thrift.transport.TSocket;
 +import org.apache.thrift.transport.TTransportException;
 +import org.hamcrest.Description;
 +import org.hamcrest.TypeSafeMatcher;
 +import org.junit.After;
 +import org.junit.AfterClass;
 +import org.junit.Before;
 +import org.junit.BeforeClass;
 +import org.junit.Rule;
 +import org.junit.Test;
 +import org.junit.rules.ExpectedException;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +/**
 + * Tests impersonation of clients by the proxy over SASL
 + */
 +public class KerberosProxyIT extends AccumuloITBase {
 +  private static 

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 8c3094f66188c086e105211bd4e73577f744824c
Parents: 09c3832 1e087ba
Author: Josh Elser 
Authored: Mon Aug 15 14:14:11 2016 -0400
Committer: Josh Elser 
Committed: Mon Aug 15 14:14:11 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/8c3094f6/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 91b2637,d2fc259..fc3be57
--- 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
@@@ -38,7 -36,7 +38,8 @@@ import org.apache.accumulo.core.client.
  import org.apache.accumulo.core.client.TableOfflineException;
  import org.apache.accumulo.core.client.impl.TabletLocator.TabletLocation;
  import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
 +import org.apache.accumulo.core.client.sample.SamplerConfiguration;
+ import org.apache.accumulo.core.conf.Property;
  import org.apache.accumulo.core.data.Column;
  import org.apache.accumulo.core.data.Key;
  import org.apache.accumulo.core.data.KeyValue;
@@@ -252,11 -243,11 +254,11 @@@ public class ThriftScanner 
  
error = "Failed to locate tablet for table : " + 
scanState.tableId + " row : " + scanState.startRow;
if (!error.equals(lastError))
 -log.debug(error);
 +log.debug("{}", error);
else if (log.isTraceEnabled())
 -log.trace(error);
 +log.trace("{}", error);
lastError = error;
-   sleepMillis = pause(sleepMillis);
+   sleepMillis = pause(sleepMillis, maxSleepTime);
  } else {
// when a tablet splits we do want to continue scanning the low 
child
// of the split if we are already passed it
@@@ -279,12 -270,12 +281,12 @@@
} catch (AccumuloException e) {
  error = "exception from tablet loc " + e.getMessage();
  if (!error.equals(lastError))
 -  log.debug(error);
 +  log.debug("{}", error);
  else if (log.isTraceEnabled())
 -  log.trace(error);
 +  log.trace("{}", error);
  
  lastError = error;
- sleepMillis = pause(sleepMillis);
+ sleepMillis = pause(sleepMillis, maxSleepTime);
} finally {
  locateSpan.stop();
}

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

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 2a373da9e3d76482b777edf7df7af48f2c84440c
Parents: 6cc07fa 5b80b2a
Author: Christopher Tubbs 
Authored: Mon Jul 25 15:43:28 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Jul 25 15:43:28 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/2a373da9/assemble/pom.xml
--

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

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

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

[ctubbsii]

Merge branch '1.7' into 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/6cc07fa6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6cc07fa6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6cc07fa6

Branch: refs/heads/master
Commit: 6cc07fa633fdbf135e3b5d14969e6de5ff8870ef
Parents: 1bba1ee 9ad7111
Author: Christopher Tubbs 
Authored: Fri Jul 22 19:30:50 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Jul 22 19:30:50 2016 -0400

--
 README.md |  10 +-
 assemble/build.sh |   2 +-
 assemble/pom.xml  | 152 ++-
 docs/pom.xml  | 248 ++---
 pom.xml   |   2 +-
 server/native/pom.xml |   1 +
 test/pom.xml  |  55 --
 7 files changed, 208 insertions(+), 262 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/README.md
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/assemble/pom.xml
--
diff --cc assemble/pom.xml
index 1b7d054,4bb937c..9c1639a
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@@ -122,7 -151,8 +151,8 @@@
  
  
org.apache.commons
 -  commons-math
 +  commons-math3
+   true
  
  
org.apache.commons
@@@ -250,93 -327,5 +327,22 @@@
  

  
 +
-   assemble
-   
- 
-   
- org.apache.maven.plugins
- maven-assembly-plugin
- 
-   
- binary-assembly
- 
-   single
- 
- package
- 
-   
- 
src/main/assemblies/binary-release.xml
-   
- 
-   
- 
-   
- 
-   
- 
- 
-   make-accumulo-home
-   
- 
- 
-   pom.xml
- 
-   
-   
- 
-   
- org.apache.maven.plugins
- maven-assembly-plugin
- 
-   
- directory-assembly
- 
-   single
- 
- package
- 
-   ${project.build.finalName}
-   ${DEV_ACCUMULO_HOME}
-   
- dir
-   
-   
- 
src/main/assemblies/dev-directory.xml
-   
- 
-   
- 
-   
- 
-   
- 
- 
-   docs
-   
- 
-   org.apache.accumulo
-   accumulo-docs
-   user-manual
-   html
- 
-   
- 
- 
 +  
 +  mrit
 +  
 +
 +  mrit
 +
 +  
 +  
 +
 +  org.apache.accumulo
 +  accumulo-test
 +  mrit
++  true
 +
 +  
 +

  

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

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

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc07fa6/test/pom.xml
--
diff --cc test/pom.xml
index b6c392c,a78ba7e..92aeeaf
--- a/test/pom.xml
+++ b/test/pom.xml
@@@ -286,117 -235,43 +286,62 @@@


  
-   shared-mini-for-it
-   
-   
- 
-   
- org.apache.maven.plugins
- maven-dependency-plugin
- 
-   
- setup-mini-classpath
- 
-   build-classpath
- 
- pre-integration-test
- 
-   test
-   accumulo-it-mini-classpath
- 
-   
- 
-   
-   
- org.codehaus.mojo
- exec-maven-plugin
- 
-   
- run-mini-for-integration-tests
- 
-   java
- 
- pre-integration-test
- 
-   
org.apache.accumulo.maven.plugin.StartMojo
-   test
- 

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 61e28dcb3ee4bca72632286a6115fe86b75adacf
Parents: d074eff cfebe56
Author: Josh Elser 
Authored: Fri Jul 22 15:09:00 2016 -0400
Committer: Josh Elser 
Committed: Fri Jul 22 15:09:00 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/61e28dcb/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
--

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 24deb39232a463149498bff4df6755ffdfd4b71d
Parents: 4c4ad86 8949e3d
Author: Josh Elser 
Authored: Mon Jul 11 17:49:24 2016 -0400
Committer: Josh Elser 
Committed: Mon Jul 11 17:49:24 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/24deb392/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
index 467a69b,000..11f0634
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@@ -1,1435 -1,0 +1,1404 @@@
 +/*
 + * 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.test.replication;
 +
 +import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
 +import java.net.URI;
 +import java.net.URISyntaxException;
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.EnumSet;
 +import java.util.HashSet;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.NoSuchElementException;
 +import java.util.Set;
 +import java.util.UUID;
 +import java.util.concurrent.TimeUnit;
 +import java.util.concurrent.atomic.AtomicBoolean;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.AccumuloException;
 +import org.apache.accumulo.core.client.AccumuloSecurityException;
 +import org.apache.accumulo.core.client.BatchWriter;
 +import org.apache.accumulo.core.client.BatchWriterConfig;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.IteratorSetting;
 +import org.apache.accumulo.core.client.IteratorSetting.Column;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.TableOfflineException;
 +import org.apache.accumulo.core.client.ZooKeeperInstance;
 +import org.apache.accumulo.core.client.admin.TableOperations;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Mutation;
 +import org.apache.accumulo.core.data.Range;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.data.impl.KeyExtent;
 +import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 +import org.apache.accumulo.core.iterators.conf.ColumnSet;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.schema.MetadataSchema;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection;
 +import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.LogColumnFamily;
 +import org.apache.accumulo.core.protobuf.ProtobufUtil;
 +import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
 +import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection;
 +import org.apache.accumulo.core.replication.ReplicationTable;
 +import org.apache.accumulo.core.replication.ReplicationTableOfflineException;
 +import org.apache.accumulo.core.replication.ReplicationTarget;
 +import org.apache.accumulo.core.security.Authorizations;
 +import 

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

[elserj]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 4c4ad86645336d84cbe4ca4ef75e6e0f03d58e6a
Parents: 757dedf 196b6bd
Author: Josh Elser 
Authored: Mon Jul 11 15:48:07 2016 -0400
Committer: Josh Elser 
Committed: Mon Jul 11 15:48:07 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/4c4ad866/shell/src/main/java/org/apache/accumulo/shell/Shell.java
--

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

[busbey]

Merge branch '1.7' into 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/e8118511
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e8118511
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e8118511

Branch: refs/heads/master
Commit: e81185117335a38356afb787197409350e730363
Parents: 08d279f 3aecf0a
Author: Sean Busbey 
Authored: Fri Jun 17 15:55:17 2016 -0500
Committer: Sean Busbey 
Committed: Fri Jun 17 15:55:17 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e8118511/README.md
--
diff --cc README.md
index eda81ce,a62df38..f56527b
--- a/README.md
+++ b/README.md
@@@ -97,19 -101,46 +97,51 @@@ The Accumulo project maintains binary c
  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]
  
- [1]: https://accumulo.apache.org
+ 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]: http://research.google.com/archive/bigtable.html
 -[5]: http://hadoop.apache.org
 -[6]: http://zookeeper.apache.org
 -[7]: http://thrift.apache.org/
 -[8]: http://accumulo.apache.org/notable_features.html
 -[9]: http://maven.apache.org/
 -[12]: http://semver.org/spec/v2.0.0.html
 +[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
+ [java-export]: 
http://www.oracle.com/us/products/export/export-regulations-345813.html
+ [bouncy-faq]: 
http://www.bouncycastle.org/wiki/display/JA1/Frequently+Asked+Questions

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

[ctubbsii]

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 9dec120e0286952160452dc7d4f8c70c4c37d1b3
Parents: 8b96dcf 04d0c19
Author: Christopher Tubbs 
Authored: Mon May 9 18:10:18 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon May 9 18:10:18 2016 -0400

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