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

[mjwall]

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/bdb27e97
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bdb27e97
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bdb27e97

Branch: refs/heads/1.8
Commit: bdb27e9782825ede6d683089372f48f30f9c4fd3
Parents: f412042 13d3f5d
Author: Michael Wall 
Authored: Thu Feb 9 10:48:03 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 10:48:03 2017 -0500

--
 UPGRADING.md | 106 --
 1 file changed, 106 deletions(-)
--

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

[kturner]

Merge branch '1.7' into 1.8

Conflicts:

test/src/main/java/org/apache/accumulo/test/functional/ConcurrentDeleteTableIT.java

test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java


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

Branch: refs/heads/1.8
Commit: 1f31ca6c24d33458c7582f9cf0257e9f58508007
Parents: bf5b6e0 6d8a5fa
Author: Keith Turner 
Authored: Mon Jan 30 15:09:36 2017 -0500
Committer: Keith Turner 
Committed: Mon Jan 30 15:09:36 2017 -0500

--
 .../org/apache/accumulo/fate/AdminUtil.java | 72 
 .../master/tableOps/CancelCompactions.java  |  2 +-
 .../master/tableOps/FinishCancelCompaction.java | 12 +++-
 .../apache/accumulo/test/TableOperationsIT.java |  7 ++
 .../accumulo/test/UserCompactionStrategyIT.java |  6 ++
 .../functional/ConcurrentDeleteTableIT.java | 34 +
 .../test/functional/FateStarvationIT.java   |  2 +
 .../test/functional/FunctionalTestUtils.java| 30 
 .../accumulo/test/functional/RenameIT.java  |  2 +
 9 files changed, 118 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f31ca6c/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
index d1a52fb,000..a83b0e2
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
@@@ -1,375 -1,0 +1,382 @@@
 +/*
 + * 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.assertTrue;
 +import static org.junit.Assert.fail;
 +
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.Collection;
 +import java.util.Collections;
 +import java.util.Comparator;
 +import java.util.HashMap;
 +import java.util.HashSet;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Set;
 +import java.util.SortedSet;
 +import java.util.TreeMap;
 +import java.util.TreeSet;
 +import java.util.concurrent.TimeUnit;
 +
 +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.IteratorSetting;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.TableExistsException;
 +import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.admin.DiskUsage;
 +import org.apache.accumulo.core.client.admin.TableOperations;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.constraints.DefaultKeySizeConstraint;
 +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.Value;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.core.security.TablePermission;
 +import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 +import org.apache.accumulo.harness.AccumuloClusterHarness;
 +import org.apache.accumulo.test.functional.BadIterator;
++import org.apache.accumulo.test.functional.FunctionalTestUtils;
 +import org.apache.hadoop.io.Text;
 +import org.apache.thrift.TException;
++import org.junit.After;
 +import org.junit.Assert;
 +import org.junit.Before;
 +import org.junit.Test;
 +
 +import 

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

[dlmarion]

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/271800c3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/271800c3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/271800c3

Branch: refs/heads/1.8
Commit: 271800c36dd7199d1744c8eb7ab7c87907108352
Parents: 8b24701 ffd5028
Author: Dave Marion 
Authored: Tue Aug 23 09:57:07 2016 -0400
Committer: Dave Marion 
Committed: Tue Aug 23 09:57:07 2016 -0400

--
 .../org/apache/accumulo/server/util/ZooZap.java | 27 
 1 file changed, 16 insertions(+), 11 deletions(-)
--

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

[dlmarion]

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/711b4211
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/711b4211
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/711b4211

Branch: refs/heads/1.8
Commit: 711b4211d3ff9deca792e90d83f4afcae1e28db1
Parents: 30d065d 8aaef9e
Author: Dave Marion 
Authored: Tue Aug 16 13:03:05 2016 -0400
Committer: Dave Marion 
Committed: Tue Aug 16 13:03:05 2016 -0400

--
 assemble/bin/bootstrap_config.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/711b4211/assemble/bin/bootstrap_config.sh
--

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

[dlmarion]

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/24289e2c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24289e2c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24289e2c

Branch: refs/heads/1.8
Commit: 24289e2c4c32850185b8649a5022b495c3205a83
Parents: a98dbec 1ca7e2e
Author: Dave Marion 
Authored: Tue Jun 14 09:21:33 2016 -0400
Committer: Dave Marion 
Committed: Tue Jun 14 09:21:33 2016 -0400

--
 .../java/org/apache/accumulo/start/Main.java| 35 +---
 1 file changed, 31 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/24289e2c/start/src/main/java/org/apache/accumulo/start/Main.java
--
diff --cc start/src/main/java/org/apache/accumulo/start/Main.java
index 99e1d5c,90eb5f4..414394a
--- a/start/src/main/java/org/apache/accumulo/start/Main.java
+++ b/start/src/main/java/org/apache/accumulo/start/Main.java
@@@ -183,7 -210,7 +210,7 @@@ public class Main 
  System.out.println("accumulo " + kwString + " |  args");
}
  
-   public static Map getExecutables(final 
ClassLoader cl) {
 -  static synchronized Map getExecutables(final 
ClassLoader cl) {
++  public static synchronized Map 
getExecutables(final ClassLoader cl) {
  if (servicesMap == null) {
servicesMap = 
checkDuplicates(ServiceLoader.load(KeywordExecutable.class, cl));
  }

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

[mjwall]

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/ec69f299
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec69f299
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ec69f299

Branch: refs/heads/1.8
Commit: ec69f299a49b4283fe8112e70e894eca8ff336d3
Parents: 60591c8 5f02d56
Author: Michael Wall 
Authored: Wed Jun 8 08:37:36 2016 -0400
Committer: Michael Wall 
Committed: Wed Jun 8 08:37:36 2016 -0400

--

--

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

[kturner]

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/c8621bbc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8621bbc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8621bbc

Branch: refs/heads/1.8
Commit: c8621bbc8474f6169c61a9a687453646db42a882
Parents: 85ff374 d33b2a0
Author: Keith Turner 
Authored: Tue May 31 19:08:57 2016 -0400
Committer: Keith Turner 
Committed: Tue May 31 19:08:57 2016 -0400

--

--

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

[dlmarion]

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/135bf025
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/135bf025
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/135bf025

Branch: refs/heads/1.8
Commit: 135bf0250752f76a32bb48703676e928ccf42452
Parents: d950d35 b3df354
Author: Dave Marion 
Authored: Fri May 20 12:48:39 2016 -0400
Committer: Dave Marion 
Committed: Fri May 20 12:48:39 2016 -0400

--
 pom.xml |   2 +-
 .../classloader/vfs/AccumuloVFSClassLoader.java |   4 +-
 .../vfs/providers/HdfsFileAttributes.java   |  59 -
 .../providers/HdfsFileContentInfoFactory.java   |  50 
 .../vfs/providers/HdfsFileObject.java   | 240 ---
 .../vfs/providers/HdfsFileProvider.java |  65 -
 .../vfs/providers/HdfsFileSystem.java   | 126 --
 .../providers/HdfsFileSystemConfigBuilder.java  |  45 
 .../vfs/providers/HdfsRandomAccessContent.java  | 228 --
 .../classloader/vfs/providers/package.html  |  19 --
 .../providers/ReadOnlyHdfsFileProviderTest.java |   2 +
 .../accumulo/start/test/AccumuloDFSBase.java|   2 +-
 12 files changed, 6 insertions(+), 836 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/135bf025/pom.xml
--
diff --cc pom.xml
index e983f11,d393fcd..8241b64
--- a/pom.xml
+++ b/pom.xml
@@@ -376,19 -356,9 +376,19 @@@

  org.apache.commons
  commons-vfs2
- 2.0
+ 2.1


 +org.apache.curator
 +curator-framework
 +${curator.version}
 +  
 +  
 +org.apache.curator
 +curator-test
 +${curator.version}
 +  
 +  
  org.apache.hadoop
  hadoop-client
  ${hadoop.version}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/135bf025/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/ReadOnlyHdfsFileProviderTest.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/135bf025/start/src/test/java/org/apache/accumulo/start/test/AccumuloDFSBase.java
--
diff --cc 
start/src/test/java/org/apache/accumulo/start/test/AccumuloDFSBase.java
index fc5c16d,000..b405466
mode 100644,00..100644
--- a/start/src/test/java/org/apache/accumulo/start/test/AccumuloDFSBase.java
+++ b/start/src/test/java/org/apache/accumulo/start/test/AccumuloDFSBase.java
@@@ -1,130 -1,0 +1,130 @@@
 +/*
 + * 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.start.test;
 +
 +import java.io.File;
 +import java.io.IOException;
 +import java.net.URI;
 +
 +import org.apache.accumulo.start.classloader.vfs.MiniDFSUtil;
- import org.apache.accumulo.start.classloader.vfs.providers.HdfsFileProvider;
 +import org.apache.commons.vfs2.CacheStrategy;
 +import org.apache.commons.vfs2.FileSystemException;
 +import org.apache.commons.vfs2.cache.DefaultFilesCache;
 +import org.apache.commons.vfs2.cache.SoftRefFilesCache;
 +import org.apache.commons.vfs2.impl.DefaultFileReplicator;
 +import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
 +import org.apache.commons.vfs2.impl.FileContentInfoFilenameFactory;
++import org.apache.commons.vfs2.provider.hdfs.HdfsFileProvider;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.hdfs.DFSConfigKeys;
 +import org.apache.hadoop.hdfs.MiniDFSCluster;
 +import org.junit.AfterClass;
 +import org.junit.BeforeClass;
 +
 +public class AccumuloDFSBase {
 +
 +  protected static Configuration conf = null;
 +  protected static DefaultFileSystemManager vfs = null;
 +  protected static MiniDFSCluster cluster = null;
 +
 +  private static URI HDFS_URI;
 +
 +  protected static URI getHdfsUri() {
 +return 

[3/3] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/1.8
Commit: c044127a98a47707d10f55a2c4b28d86d5642a2d
Parents: ce7c1fa 160e2c7
Author: Dave Marion 
Authored: Thu May 5 13:41:38 2016 -0400
Committer: Dave Marion 
Committed: Thu May 5 13:41:38 2016 -0400

--
 assemble/bin/config.sh | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[dlmarion]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: c044127a98a47707d10f55a2c4b28d86d5642a2d
Parents: ce7c1fa 160e2c7
Author: Dave Marion 
Authored: Thu May 5 13:41:38 2016 -0400
Committer: Dave Marion 
Committed: Thu May 5 13:41:38 2016 -0400

--
 assemble/bin/config.sh | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: c43c7be6b6aa6ca7c50b73ceebf7f6c9ff97bee7
Parents: d1cb53b e77bdd7
Author: Josh Elser 
Authored: Sun Apr 17 13:44:54 2016 -0400
Committer: Josh Elser 
Committed: Sun Apr 17 13:44:54 2016 -0400

--
 .../accumulo/core/client/impl/TabletServerBatchWriter.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


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

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 25b99c258be3768d144338548d1f14aeed4b8767
Parents: 3525269 0f6e5ed
Author: Josh Elser 
Authored: Mon Apr 11 13:54:11 2016 -0400
Committer: Josh Elser 
Committed: Mon Apr 11 13:54:11 2016 -0400

--

--

[3/3] accumulo git commit: Merge branch '1.7'

[kturner]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 574234293147bbc63863d3210eb2baf94c5387f6
Parents: 0dd1d6a 2e4f320
Author: Keith Turner 
Authored: Fri Apr 1 13:00:21 2016 -0400
Committer: Keith Turner 
Committed: Fri Apr 1 13:00:21 2016 -0400

--
 core/src/main/findbugs/exclude-filter.xml   |   5 +
 .../core/file/blockfile/ABlockReader.java   |   2 +
 .../file/blockfile/impl/CachableBlockFile.java  |  31 ++-
 .../impl/SeekableByteArrayInputStream.java  | 141 
 .../core/file/rfile/MultiLevelIndex.java| 219 +--
 5 files changed, 308 insertions(+), 90 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/57423429/core/src/main/findbugs/exclude-filter.xml
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/57423429/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
--

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

[3/3] accumulo git commit: Merge branch '1.7'

[dlmarion]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 02450e4f60f41ea52ffed7103459c252e8654630
Parents: 173d80e 2b286ba
Author: Dave Marion 
Authored: Thu Mar 31 16:34:09 2016 -0400
Committer: Dave Marion 
Committed: Thu Mar 31 16:34:09 2016 -0400

--
 .../java/org/apache/accumulo/core/conf/Property.java |  3 +--
 .../java/org/apache/accumulo/tserver/TabletServer.java   |  3 ++-
 .../apache/accumulo/tserver/log/TabletServerLogger.java  | 11 ---
 3 files changed, 11 insertions(+), 6 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/02450e4f/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/02450e4f/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index b76b9cd,c7b6c98..1c9c5b9
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@@ -152,17 -146,19 +155,18 @@@ public class TabletServerLogger 
  this.flushCounter = flushCounter;
  this.retryFactory = retryFactory;
  this.retry = null;
+ this.maxAge = maxAge;
}
  
 -  private int initializeLoggers(final List copy) throws 
IOException {
 -final int[] result = {-1};
 -testLockAndRun(logSetLock, new TestCallWithWriteLock() {
 +  private DfsLogger initializeLoggers(final AtomicInteger logIdOut) throws 
IOException {
 +final AtomicReference result = new 
AtomicReference();
 +testLockAndRun(logIdLock, new TestCallWithWriteLock() {
@Override
boolean test() {
 -copy.clear();
 -copy.addAll(loggers);
 -if (!loggers.isEmpty())
 -  result[0] = logSetId.get();
 -return loggers.isEmpty();
 +result.set(currentLog);
 +if (currentLog != null)
 +  logIdOut.set(logId.get());
 +return currentLog == null;
}
  
@Override
@@@ -209,25 -200,18 +213,26 @@@
  }
  
  try {
 -  DfsLogger alog = new DfsLogger(tserver.getServerConfig(), syncCounter, 
flushCounter);
 -  alog.open(tserver.getClientAddressString());
 -  loggers.add(alog);
 -  logSetId.incrementAndGet();
 -
 -  // When we successfully create a WAL, make sure to reset the Retry.
 -  if (null != retry) {
 -retry = null;
 +  startLogMaker();
 +  Object next = nextLog.take();
 +  if (next instanceof Exception) {
 +throw (Exception) next;
}
 +  if (next instanceof DfsLogger) {
 +currentLog = (DfsLogger) next;
 +logId.incrementAndGet();
 +log.info("Using next log " + currentLog.getFileName());
 +
 +// When we successfully create a WAL, make sure to reset the Retry.
 +if (null != retry) {
 +  retry = null;
 +}
  
 -  this.createTime = System.currentTimeMillis();
 -  return;
++this.createTime = System.currentTimeMillis();
 +return;
 +  } else {
 +throw new RuntimeException("Error: unexpected type seen: " + next);
 +  }
  } catch (Exception t) {
if (null == retry) {
  retry = retryFactory.create();
@@@ -434,12 -363,12 +439,12 @@@
  });
}
  }
- // if the log gets too big, reset it .. grab the write lock first
+ // if the log gets too big or too old, reset it .. grab the write lock 
first
  logSizeEstimate.addAndGet(4 * 3); // event, tid, seq overhead
 -testLockAndRun(logSetLock, new TestCallWithWriteLock() {
 +testLockAndRun(logIdLock, new TestCallWithWriteLock() {
@Override
boolean test() {
- return logSizeEstimate.get() > maxSize;
+ return (logSizeEstimate.get() > maxSize) || 
((System.currentTimeMillis() - createTime) > maxAge);
}
  
@Override

[3/3] accumulo git commit: Merge branch '1.7'

[dlmarion]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 173d80e11c2e6e99f26fd42f1a4c6726fe926ae5
Parents: 1d49030 cd5eb1f
Author: Dave Marion 
Authored: Thu Mar 31 14:54:32 2016 -0400
Committer: Dave Marion 
Committed: Thu Mar 31 14:54:32 2016 -0400

--
 assemble/conf/templates/accumulo-env.sh |  2 +-
 .../apache/accumulo/tserver/TabletServer.java   | 26 +---
 .../start/classloader/vfs/ContextManager.java   |  7 --
 3 files changed, 12 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/173d80e1/assemble/conf/templates/accumulo-env.sh
--
diff --cc assemble/conf/templates/accumulo-env.sh
index 205bd6c,42633a7..2ad753a
--- a/assemble/conf/templates/accumulo-env.sh
+++ b/assemble/conf/templates/accumulo-env.sh
@@@ -48,10 -48,8 +48,10 @@@ test -z "$ACCUMULO_TSERVER_OPTS" && exp
  test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} 
${masterHigh_masterLow}"
  test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} 
${monitorHigh_monitorLow}"
  test -z "$ACCUMULO_GC_OPTS"  && export ACCUMULO_GC_OPTS="${gcHigh_gcLow}"
 +test -z "$ACCUMULO_SHELL_OPTS"   && export 
ACCUMULO_SHELL_OPTS="${shellHigh_shellLow}"
- test -z "$ACCUMULO_GENERAL_OPTS" && export 
ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true"
+ test -z "$ACCUMULO_GENERAL_OPTS" && export 
ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true 
-XX:+CMSClassUnloadingEnabled"
  test -z "$ACCUMULO_OTHER_OPTS"   && export 
ACCUMULO_OTHER_OPTS="${otherHigh_otherLow}"
 +test -z "${ACCUMULO_PID_DIR}"&& export 
ACCUMULO_PID_DIR="${ACCUMULO_HOME}/run"
  # what do when the JVM runs out of heap memory
  export ACCUMULO_KILL_CMD='kill -9 %p'
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/173d80e1/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index d19dfa9,eabf51d..b044b3e
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -2753,25 -2782,10 +2753,11 @@@ public class TabletServer extends Accum
  Runnable contextCleaner = new Runnable() {
@Override
public void run() {
- ArrayList extents;
- 
- synchronized (onlineTablets) {
-   extents = new ArrayList(onlineTablets.keySet());
- }
- 
- Set tables = new HashSet();
- 
- for (KeyExtent keyExtent : extents) {
-   tables.add(keyExtent.getTableId());
- }
- 
- HashSet contexts = new HashSet();
- 
- for (String tableid : tables) {
-   String context = getTableConfiguration(new KeyExtent(tableid, null, 
null)).get(Property.TABLE_CLASSPATH);
-   if (!context.equals("")) {
- contexts.add(context);
-   }
 -Set contextProperties = 
getConfiguration().getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY).keySet();
++Set contextProperties = 
getServerConfigurationFactory().getConfiguration().getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY)
++.keySet();
+ Set configuredContexts = new HashSet();
+ for (String prop : contextProperties) {
+   
configuredContexts.add(prop.substring(Property.VFS_CONTEXT_CLASSPATH_PROPERTY.name().length()));
  }
  
  try {

[3/3] accumulo git commit: Merge branch '1.7'

[dlmarion]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: e5325306660e733d3c2b691d52feb662a6dac86b
Parents: c4d6eee d1a9c52
Author: Dave Marion 
Authored: Wed Mar 2 16:01:44 2016 -0500
Committer: Dave Marion 
Committed: Wed Mar 2 16:01:44 2016 -0500

--
 .../client/impl/TabletServerBatchWriter.java| 126 +--
 .../accumulo/core/util/SimpleThreadPool.java|   6 +
 .../test/functional/BatchWriterFlushIT.java |  91 +-
 3 files changed, 182 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e5325306/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index bc90d00,8922ac5..35281d6
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@@ -638,12 -666,14 +665,14 @@@ public class TabletServerBatchWriter 
queued = new HashSet();
sendThreadPool = new SimpleThreadPool(numSendThreads, 
this.getClass().getName());
locators = new HashMap();
+   binningThreadPool = new SimpleThreadPool(1, "BinMutations", new 
SynchronousQueue());
+   binningThreadPool.setRejectedExecutionHandler(new 
ThreadPoolExecutor.CallerRunsPolicy());
  }
  
- private TabletLocator getLocator(String tableId) {
+ private synchronized TabletLocator getLocator(String tableId) {
TabletLocator ret = locators.get(tableId);
if (ret == null) {
 -ret = TabletLocator.getLocator(context, new Text(tableId));
 +ret = TabletLocator.getLocator(context, tableId);
  ret = new TimeoutTabletLocator(ret, timeout);
  locators.put(tableId, ret);
}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e5325306/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
index 353a6b9,000..5aa0c84
mode 100644,00..100644
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
@@@ -1,178 -1,0 +1,265 @@@
 +/*
 + * 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.ArrayList;
++import java.util.Collections;
++import java.util.HashSet;
 +import java.util.Iterator;
++import java.util.LinkedList;
++import java.util.List;
 +import java.util.Map.Entry;
 +import java.util.Random;
++import java.util.Set;
++import java.util.TreeSet;
 +import java.util.concurrent.TimeUnit;
 +
 +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.MutationsRejectedException;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.TableNotFoundException;
 +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 

[3/3] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: c4d6eee2ef9a9a9e016405850f970da28b705b14
Parents: 2651ba8 85b5582
Author: Christopher Tubbs 
Authored: Thu Feb 25 18:44:09 2016 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 25 18:44:09 2016 -0500

--

--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 4b88ec84421b56339d7a8fd5edaac588192b938f
Parents: 3c023a3 a7e45df
Author: Josh Elser 
Authored: Wed Feb 17 14:03:07 2016 -0500
Committer: Josh Elser 
Committed: Wed Feb 17 14:03:07 2016 -0500

--
 .../server/security/handler/KerberosAuthenticator.java  |  9 +
 .../org/apache/accumulo/test/functional/KerberosIT.java | 12 
 2 files changed, 17 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4b88ec84/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java
index f7a151e,000..e636daa
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java
@@@ -1,644 -1,0 +1,656 @@@
 +/*
 + * 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 org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
 +import static org.junit.Assert.assertNotNull;
 +import static org.junit.Assert.assertTrue;
 +import static org.junit.Assert.fail;
 +
 +import java.io.File;
 +import java.lang.reflect.UndeclaredThrowableException;
 +import java.security.PrivilegedExceptionAction;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.HashSet;
 +import java.util.Iterator;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.concurrent.TimeUnit;
 +
 +import org.apache.accumulo.cluster.ClusterUser;
 +import org.apache.accumulo.core.client.AccumuloException;
 +import org.apache.accumulo.core.client.AccumuloSecurityException;
 +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.Scanner;
 +import org.apache.accumulo.core.client.TableExistsException;
 +import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.admin.CompactionConfig;
 +import org.apache.accumulo.core.client.admin.DelegationTokenConfig;
 +import org.apache.accumulo.core.client.impl.AuthenticationTokenIdentifier;
 +import org.apache.accumulo.core.client.impl.DelegationTokenImpl;
 +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.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.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.RootTable;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.core.security.ColumnVisibility;
 +import org.apache.accumulo.core.security.SystemPermission;
 +import org.apache.accumulo.core.security.TablePermission;
 +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.ServerType;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 +import 

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: de5041695e45754603fd1b647779b2732d9a6dfa
Parents: cf75edb c85e04f
Author: Josh Elser 
Authored: Sun Feb 7 22:08:46 2016 -0500
Committer: Josh Elser 
Committed: Sun Feb 7 22:08:46 2016 -0500

--
 ...redentialsUpdatingInvocationHandlerTest.java | 79 
 .../test/functional/KerberosProxyIT.java|  4 +-
 2 files changed, 81 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/de504169/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 f705e1b,000..8001a48
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,423 @@@
 +/*
 + * 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 

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: cf75edb45e77694ffd6442bbc2934e20c0277c7c
Parents: 860ee35 e43e927
Author: Josh Elser 
Authored: Sat Feb 6 16:40:30 2016 -0500
Committer: Josh Elser 
Committed: Sat Feb 6 16:40:30 2016 -0500

--
 .../org/apache/accumulo/core/conf/Property.java |   5 +
 docs/src/main/asciidoc/chapters/kerberos.txt|  52 ++--
 .../server/security/UserImpersonation.java  |  97 ++-
 ...redentialsUpdatingInvocationHandlerTest.java |  55 ++--
 .../server/security/UserImpersonationTest.java  | 259 ++-
 5 files changed, 422 insertions(+), 46 deletions(-)
--


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

[3/3] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: c3f596eadc0946eb55dc16575c6b9be8e63f214e
Parents: 2d99238 9036325
Author: Eric C. Newton 
Authored: Wed Jan 27 09:01:54 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:01:54 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  8 
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 13 insertions(+), 26 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[kturner]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: e59649b6dfcda463b04d37015d25dafd6457
Parents: 702ea54 c9c60d3
Author: Keith Turner 
Authored: Tue Jan 19 18:49:44 2016 -0500
Committer: Keith Turner 
Committed: Tue Jan 19 18:49:44 2016 -0500

--
 .../core/util/UnsynchronizedBuffer.java |  4 +-
 .../core/util/UnsynchronizedBufferTest.java | 56 
 2 files changed, 58 insertions(+), 2 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[kturner]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: dee8d7abad96668c01493abc1f69657f6d262c32
Parents: 1255574 ff08336
Author: Keith Turner 
Authored: Mon Jan 4 14:11:47 2016 -0500
Committer: Keith Turner 
Committed: Mon Jan 4 14:11:47 2016 -0500

--
 .../core/security/VisibilityEvaluator.java  | 60 +++-
 .../core/security/VisibilityEvaluatorTest.java  | 37 +++-
 2 files changed, 95 insertions(+), 2 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[kturner]

Merge branch '1.7'

Conflicts:
assemble/bin/start-server.sh


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

Branch: refs/heads/master
Commit: 9d91738938ebe4068169a52d1aff8abdff90f6c8
Parents: 7f4cb62 a25ec8e
Author: Keith Turner 
Authored: Wed Dec 30 10:27:10 2015 -0500
Committer: Keith Turner 
Committed: Wed Dec 30 10:27:10 2015 -0500

--

--

[3/3] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 67560a618bc9f43dca8f8e12de287ca9c40a92c5
Parents: c7b27e0 f51e6b0
Author: Christopher Tubbs 
Authored: Wed Dec 16 14:27:03 2015 -0500
Committer: Christopher Tubbs 
Committed: Wed Dec 16 14:27:03 2015 -0500

--
 pom.xml | 1 -
 1 file changed, 1 deletion(-)
--


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

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: afd31edb7c5fa33159ab4778b04f9e8727d9ddaa
Parents: 472bdd9 afa475d
Author: Josh Elser 
Authored: Fri Dec 4 14:49:03 2015 -0500
Committer: Josh Elser 
Committed: Fri Dec 4 14:49:03 2015 -0500

--
 .../org/apache/accumulo/test/BulkImportSequentialRowsIT.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/afd31edb/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
index 0297c14,000..1cfd3e6
mode 100644,00..100644
--- 
a/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
@@@ -1,108 -1,0 +1,112 @@@
 +/*
 + * 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.assertTrue;
 +
 +import java.util.TreeSet;
 +
 +import org.apache.accumulo.core.client.admin.TableOperations;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.harness.AccumuloClusterHarness;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.fs.FileSystem;
++import org.apache.hadoop.fs.FsShell;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.hadoop.fs.RawLocalFileSystem;
 +import org.apache.hadoop.io.Text;
 +import org.junit.Test;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import com.google.common.collect.Iterables;
 +
 +// ACCUMULO-3967
 +public class BulkImportSequentialRowsIT extends AccumuloClusterHarness {
 +  private static final Logger log = 
LoggerFactory.getLogger(BulkImportSequentialRowsIT.class);
 +
 +  private static final long NR = 24;
 +  private static final long NV = 42000;
 +
 +  @Override
 +  public int defaultTimeoutSeconds() {
 +return 60;
 +  }
 +
 +  @Override
 +  public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
 +// Need more than one tserver
 +cfg.setNumTservers(2);
 +
 +// use raw local file system so walogs sync and flush will work
 +hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
 +  }
 +
 +  @Test
 +  public void testBulkImportFailure() throws Exception {
 +String tableName = getUniqueNames(1)[0];
 +TableOperations to = getConnector().tableOperations();
 +to.create(tableName);
 +FileSystem fs = getFileSystem();
 +Path rootPath = new Path(fs.makeQualified(getUsableDir()), 
getClass().getSimpleName());
 +log.info("Writing to {}", rootPath);
 +if (fs.exists(rootPath)) {
 +  assertTrue(fs.delete(rootPath, true));
 +}
 +assertTrue(fs.mkdirs(rootPath));
 +
 +Path bulk = new Path(rootPath, "bulk");
 +log.info("bulk: {}", bulk);
 +assertTrue(fs.mkdirs(bulk));
 +Path err = new Path(rootPath, "err");
 +log.info("err: {}", err);
 +
 +assertTrue(fs.mkdirs(bulk));
 +assertTrue(fs.mkdirs(err));
 +
 +Path rfile = new Path(bulk, "file.rf");
 +
 +log.info("Generating RFile {}", rfile.toUri().toString());
 +
 +GenerateSequentialRFile.main(new String[] {"-f", 
rfile.toUri().toString(), "-nr", Long.toString(NR), "-nv", Long.toString(NV)});
 +
 +assertTrue("Expected that " + rfile + " exists, but it does not", 
fs.exists(rfile));
 +
++FsShell fsShell = new FsShell(fs.getConf());
++assertEquals("Failed to chmod " + rootPath, 0, fsShell.run(new String[] 
{"-chmod", "-R", "777", rootPath.toString()}));

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 6e5fa1c6bf8e6193439c81d57aa36159d5197ad9
Parents: 46e5d5c 3aa9d30
Author: Josh Elser 
Authored: Thu Dec 3 16:15:54 2015 -0500
Committer: Josh Elser 
Committed: Thu Dec 3 16:15:54 2015 -0500

--
 .../org/apache/accumulo/core/conf/Property.java |   2 +
 .../apache/accumulo/core/rpc/ThriftUtil.java|  60 ++
 .../accumulo/server/security/SecurityUtil.java  |  47 -
 .../org/apache/accumulo/harness/TestingKdc.java |  13 +-
 .../test/functional/KerberosRenewalIT.java  | 188 +++
 5 files changed, 303 insertions(+), 7 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6e5fa1c6/test/src/main/java/org/apache/accumulo/harness/TestingKdc.java
--
diff --cc test/src/main/java/org/apache/accumulo/harness/TestingKdc.java
index 1f84fc8,000..653139a
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/harness/TestingKdc.java
+++ b/test/src/main/java/org/apache/accumulo/harness/TestingKdc.java
@@@ -1,212 -1,0 +1,219 @@@
 +/*
 + * 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.harness;
 +
 +import static com.google.common.base.Preconditions.checkArgument;
 +import static com.google.common.base.Preconditions.checkNotNull;
 +import static org.junit.Assert.assertTrue;
 +
 +import java.io.File;
 +import java.net.InetAddress;
 +import java.util.ArrayList;
 +import java.util.List;
 +import java.util.Properties;
 +
 +import org.apache.accumulo.cluster.ClusterUser;
 +import org.apache.hadoop.minikdc.MiniKdc;
 +import org.junit.Assert;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +/**
 + * Creates a {@link MiniKdc} for tests to use to exercise secure Accumulo
 + */
 +public class TestingKdc {
 +  private static final Logger log = LoggerFactory.getLogger(TestingKdc.class);
 +
 +  public static final int NUM_USERS = 10;
++  public static final long MAX_TICKET_LIFETIME_MILLIS = 8640; // one day
 +
 +  protected MiniKdc kdc = null;
 +  protected ClusterUser accumuloServerUser = null, accumuloAdmin = null;
 +  protected List clientPrincipals = null;
 +
 +  public final String ORG_NAME = "EXAMPLE", ORG_DOMAIN = "COM";
 +
 +  private String hostname;
 +  private File keytabDir;
 +  private boolean started = false;
 +
 +  public TestingKdc() throws Exception {
- this(computeKdcDir(), computeKeytabDir());
++this(computeKdcDir(), computeKeytabDir(), MAX_TICKET_LIFETIME_MILLIS);
 +  }
 +
-   private static File computeKdcDir() {
++  public static File computeKdcDir() {
 +File targetDir = new File(System.getProperty("user.dir"), "target");
 +if (!targetDir.exists())
 +  Assert.assertTrue(targetDir.mkdirs());
 +Assert.assertTrue("Could not find Maven target directory: " + targetDir, 
targetDir.exists() && targetDir.isDirectory());
 +
 +// Create the directories: target/kerberos/minikdc
 +File kdcDir = new File(new File(targetDir, "kerberos"), "minikdc");
 +
 +assertTrue(kdcDir.mkdirs() || kdcDir.isDirectory());
 +
 +return kdcDir;
 +  }
 +
-   private static File computeKeytabDir() {
++  public static File computeKeytabDir() {
 +File targetDir = new File(System.getProperty("user.dir"), "target");
 +Assert.assertTrue("Could not find Maven target directory: " + targetDir, 
targetDir.exists() && targetDir.isDirectory());
 +
 +// Create the directories: target/kerberos/keytabs
 +File keytabDir = new File(new File(targetDir, "kerberos"), "keytabs");
 +
 +

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 3521b35a12013cdb318aea28d5e05e5fd5308be3
Parents: 35cc52e 5947b42
Author: Josh Elser 
Authored: Mon Nov 16 19:56:09 2015 -0500
Committer: Josh Elser 
Committed: Mon Nov 16 19:56:09 2015 -0500

--
 .../master/MasterClientServiceHandler.java  | 21 +++-
 .../master/replication/FinishedWorkUpdater.java |  2 +-
 .../replication/MultiInstanceReplicationIT.java |  4 +++-
 test/src/main/resources/log4j.properties|  2 ++
 4 files changed, 18 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3521b35a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
--
diff --cc 
server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
index 821dad9,cff8b51..ad70b96
--- 
a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
@@@ -100,12 -99,13 +101,13 @@@ import org.slf4j.LoggerFactory
  
  import com.google.protobuf.InvalidProtocolBufferException;
  
 -class MasterClientServiceHandler extends FateServiceHandler implements 
MasterClientService.Iface {
 +public class MasterClientServiceHandler extends FateServiceHandler implements 
MasterClientService.Iface {
  
private static final Logger log = Master.log;
+   private static final Logger drainLog = 
LoggerFactory.getLogger("org.apache.accumulo.master.MasterDrainImpl");
private Instance instance;
  
 -  MasterClientServiceHandler(Master master) {
 +  protected MasterClientServiceHandler(Master master) {
  super(master);
  this.instance = master.getInstance();
}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3521b35a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
index e73a650,000..cb3df68
mode 100644,00..100644
--- 
a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
@@@ -1,731 -1,0 +1,733 @@@
 +/*
 + * 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 java.util.HashMap;
 +import java.util.Iterator;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Set;
 +import java.util.concurrent.Callable;
 +import java.util.concurrent.ExecutorService;
 +import java.util.concurrent.Executors;
 +import java.util.concurrent.Future;
 +import java.util.concurrent.TimeUnit;
 +import java.util.concurrent.TimeoutException;
 +
 +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.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.Value;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection;
 +import org.apache.accumulo.core.protobuf.ProtobufUtil;
 +import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection;
 +import org.apache.accumulo.core.replication.ReplicationTable;

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 0e136c1f4276373b09d1a2e4d901c0d16809e6db
Parents: 928864d b8ffe4c
Author: Josh Elser 
Authored: Mon Nov 2 10:45:57 2015 -0500
Committer: Josh Elser 
Committed: Mon Nov 2 10:45:57 2015 -0500

--
 .../accumulo/server/master/balancer/ChaoticLoadBalancer.java | 4 
 1 file changed, 4 insertions(+)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 928864dede16def5b1e6c68601cfa6417f36081e
Parents: 31a4a7e c996151
Author: Josh Elser 
Authored: Sun Nov 1 19:51:41 2015 -0500
Committer: Josh Elser 
Committed: Sun Nov 1 19:51:41 2015 -0500

--
 .../server/master/balancer/ChaoticLoadBalancer.java| 13 +
 1 file changed, 13 insertions(+)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'

Conflicts:

server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java


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

Branch: refs/heads/master
Commit: 31a4a7e78d18328c500d85bf8f633d39ecb6afe1
Parents: 5a3082d 0eaece7
Author: Josh Elser 
Authored: Sat Oct 31 15:39:10 2015 -0400
Committer: Josh Elser 
Committed: Sat Oct 31 15:39:10 2015 -0400

--
 .../org/apache/accumulo/core/conf/Property.java | 11 +++--
 .../apache/accumulo/tserver/TabletServer.java   | 16 +--
 .../tserver/log/TabletServerLogger.java | 44 +++-
 .../accumulo/test/TabletServerGivesUpIT.java|  2 +
 4 files changed, 56 insertions(+), 17 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/31a4a7e7/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/31a4a7e7/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index 386de35,13c742a..1102ecb
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@@ -39,8 -36,9 +39,10 @@@ import org.apache.accumulo.core.data.Mu
  import org.apache.accumulo.core.data.impl.KeyExtent;
  import org.apache.accumulo.core.protobuf.ProtobufUtil;
  import org.apache.accumulo.core.replication.ReplicationConfigurationUtil;
 -import org.apache.accumulo.core.util.UtilWaitThread;
 +import org.apache.accumulo.core.util.SimpleThreadPool;
 +import org.apache.accumulo.fate.util.LoggingRunnable;
+ import org.apache.accumulo.fate.zookeeper.Retry;
+ import org.apache.accumulo.fate.zookeeper.RetryFactory;
  import org.apache.accumulo.server.conf.TableConfiguration;
  import org.apache.accumulo.server.fs.VolumeManager;
  import org.apache.accumulo.server.replication.StatusUtil;
@@@ -57,10 -54,6 +59,8 @@@ import org.apache.hadoop.fs.Path
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
- import com.google.common.cache.Cache;
- import com.google.common.cache.CacheBuilder;
 +import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 +
  /**
   * Central logging facility for the TServerInfo.
   *
@@@ -151,19 -141,20 +150,19 @@@ public class TabletServerLogger 
  this.maxSize = maxSize;
  this.syncCounter = syncCounter;
  this.flushCounter = flushCounter;
- this.toleratedFailures = toleratedWalCreationFailures;
- this.walErrors = 
CacheBuilder.newBuilder().maximumSize(toleratedFailures).expireAfterWrite(toleratedFailuresPeriodMillis,
 TimeUnit.MILLISECONDS).build();
+ this.retryFactory = retryFactory;
+ this.retry = null;
}
  
 -  private int initializeLoggers(final List copy) throws 
IOException {
 -final int[] result = {-1};
 -testLockAndRun(logSetLock, new TestCallWithWriteLock() {
 +  private DfsLogger initializeLoggers(final AtomicInteger logIdOut) throws 
IOException {
 +final AtomicReference result = new 
AtomicReference();
 +testLockAndRun(logIdLock, new TestCallWithWriteLock() {
@Override
boolean test() {
 -copy.clear();
 -copy.addAll(loggers);
 -if (!loggers.isEmpty())
 -  result[0] = logSetId.get();
 -return loggers.isEmpty();
 +result.set(currentLog);
 +if (currentLog != null)
 +  logIdOut.set(logId.get());
 +return currentLog == null;
}
  
@Override
@@@ -210,24 -196,41 +209,49 @@@
  }
  
  try {
 -  DfsLogger alog = new DfsLogger(tserver.getServerConfig(), syncCounter, 
flushCounter);
 -  alog.open(tserver.getClientAddressString());
 -  loggers.add(alog);
 -  logSetId.incrementAndGet();
 -
 -  // When we successfully create a WAL, make sure to reset the Retry.
 -  if (null != retry) {
 -retry = null;
 +  startLogMaker();
 +  Object next = nextLog.take();
 +  if (next instanceof Exception) {
 +throw (Exception) next;
}
 +  if (next instanceof DfsLogger) {
 +currentLog = (DfsLogger) next;
 +

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: dfbb3c2990feed1e9b88e29537dd12d27426686c
Parents: 04e9139 a1d3c92
Author: Josh Elser 
Authored: Sat Oct 24 21:15:12 2015 -0400
Committer: Josh Elser 
Committed: Sat Oct 24 21:15:12 2015 -0400

--
 .../iterators/system/TimeSettingIterator.java   |  2 +-
 .../system/TimeSettingIteratorTest.java | 31 ++--
 2 files changed, 29 insertions(+), 4 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 39f14472b109170c8434de0b7d4cadf7473dbd1f
Parents: 52ba24e 89d69f6
Author: Eric C. Newton 
Authored: Tue Oct 20 16:15:07 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 20 16:15:07 2015 -0400

--
 .../accumulo/gc/GarbageCollectionAlgorithm.java | 16 +---
 .../accumulo/gc/GarbageCollectionEnvironment.java   |  6 --
 .../apache/accumulo/gc/SimpleGarbageCollector.java  | 10 --
 .../apache/accumulo/gc/GarbageCollectionTest.java   |  5 ++---
 4 files changed, 19 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/39f14472/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
--

[3/3] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 52ba24e32a4559d5ae36874d15da7c72fb799da3
Parents: a801383 1f28ee7
Author: Eric C. Newton 
Authored: Mon Oct 19 10:48:07 2015 -0400
Committer: Eric C. Newton 
Committed: Mon Oct 19 10:48:07 2015 -0400

--
 core/src/main/java/org/apache/accumulo/core/data/Mutation.java | 2 +-
 core/src/test/java/org/apache/accumulo/core/data/MutationTest.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: b34df1abaf5a1df88c8e3f53e61242b41a752231
Parents: dd420f6 d7e7c64
Author: Eric C. Newton 
Authored: Wed Oct 14 15:38:13 2015 -0400
Committer: Eric C. Newton 
Committed: Wed Oct 14 15:38:13 2015 -0400

--
 .../main/java/org/apache/accumulo/master/tableOps/LoadFiles.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b34df1ab/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
--

[3/3] accumulo git commit: Merge branch '1.7'

[ecn]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: c30e558ae92e80ffdd268c13b7def4148ecbe116
Parents: 036e739 91b161a
Author: Eric C. Newton 
Authored: Tue Oct 13 16:50:37 2015 -0400
Committer: Eric C. Newton 
Committed: Tue Oct 13 16:50:37 2015 -0400

--
 .../main/java/org/apache/accumulo/master/tableOps/BulkImport.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c30e558a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 40a8743415fe7c961f5a1e09e3f4052a81750492
Parents: 23a0847 62821a0
Author: Josh Elser 
Authored: Thu Oct 8 14:47:30 2015 -0400
Committer: Josh Elser 
Committed: Thu Oct 8 14:47:30 2015 -0400

--
 proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 1 -
 1 file changed, 1 deletion(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: a0c96e0ef5ed136addfffa74664f9c1de2f154f6
Parents: 3b4e57a e0621df
Author: Josh Elser 
Authored: Thu Sep 17 19:52:56 2015 -0400
Committer: Josh Elser 
Committed: Thu Sep 17 19:52:56 2015 -0400

--
 .../test/BulkImportSequentialRowsIT.java| 22 
 .../accumulo/test/GenerateSequentialRFile.java  |  4 +++-
 2 files changed, 16 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0c96e0e/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
index 4430fc7,000..0297c14
mode 100644,00..100644
--- 
a/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
@@@ -1,104 -1,0 +1,108 @@@
 +/*
 + * 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.assertTrue;
 +
 +import java.util.TreeSet;
 +
 +import org.apache.accumulo.core.client.admin.TableOperations;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.harness.AccumuloClusterHarness;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.fs.FileSystem;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.hadoop.fs.RawLocalFileSystem;
 +import org.apache.hadoop.io.Text;
 +import org.junit.Test;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import com.google.common.collect.Iterables;
 +
 +// ACCUMULO-3967
 +public class BulkImportSequentialRowsIT extends AccumuloClusterHarness {
 +  private static final Logger log = 
LoggerFactory.getLogger(BulkImportSequentialRowsIT.class);
 +
 +  private static final long NR = 24;
 +  private static final long NV = 42000;
 +
 +  @Override
 +  public int defaultTimeoutSeconds() {
 +return 60;
 +  }
 +
 +  @Override
 +  public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
 +// Need more than one tserver
 +cfg.setNumTservers(2);
 +
 +// use raw local file system so walogs sync and flush will work
 +hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
 +  }
 +
 +  @Test
 +  public void testBulkImportFailure() throws Exception {
 +String tableName = getUniqueNames(1)[0];
 +TableOperations to = getConnector().tableOperations();
 +to.create(tableName);
 +FileSystem fs = getFileSystem();
- Path rootPath = getUsableDir();
++Path rootPath = new Path(fs.makeQualified(getUsableDir()), 
getClass().getSimpleName());
++log.info("Writing to {}", rootPath);
++if (fs.exists(rootPath)) {
++  assertTrue(fs.delete(rootPath, true));
++}
++assertTrue(fs.mkdirs(rootPath));
++
 +Path bulk = new Path(rootPath, "bulk");
 +log.info("bulk: {}", bulk);
- if (fs.exists(bulk)) {
-   fs.delete(bulk, true);
- }
 +assertTrue(fs.mkdirs(bulk));
 +Path err = new Path(rootPath, "err");
 +log.info("err: {}", err);
- if (fs.exists(err)) {
-   fs.delete(err, true);
- }
++
++assertTrue(fs.mkdirs(bulk));
 +assertTrue(fs.mkdirs(err));
 +
 +Path rfile = new Path(bulk, "file.rf");
 +
- GenerateSequentialRFile.main(new String[] {"-f", rfile.toString(), "-nr", 
Long.toString(NR), "-nv", Long.toString(NV)});
++log.info("Generating RFile {}", rfile.toUri().toString());
++
++GenerateSequentialRFile.main(new String[] {"-f", 

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 1bd6fe0dda9857cd2487956639df78c2695cb402
Parents: 7c746a3 10aba2a
Author: Josh Elser 
Authored: Wed Sep 9 20:28:18 2015 -0400
Committer: Josh Elser 
Committed: Wed Sep 9 20:28:18 2015 -0400

--
 .../test/BulkImportSequentialRowsIT.java| 36 -
 .../accumulo/test/GenerateSequentialRFile.java  | 82 
 2 files changed, 96 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1bd6fe0d/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
index 037ec7e,000..4430fc7
mode 100644,00..100644
--- 
a/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
@@@ -1,112 -1,0 +1,104 @@@
 +/*
 + * 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.assertTrue;
 +
- import java.util.SortedSet;
 +import java.util.TreeSet;
 +
 +import org.apache.accumulo.core.client.admin.TableOperations;
- import org.apache.accumulo.core.conf.DefaultConfiguration;
- import org.apache.accumulo.core.data.Key;
- import org.apache.accumulo.core.data.Value;
- import org.apache.accumulo.core.file.FileOperations;
- import org.apache.accumulo.core.file.FileSKVWriter;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.harness.AccumuloClusterHarness;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.fs.FileSystem;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.hadoop.fs.RawLocalFileSystem;
 +import org.apache.hadoop.io.Text;
 +import org.junit.Test;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import com.google.common.collect.Iterables;
 +
 +// ACCUMULO-3967
 +public class BulkImportSequentialRowsIT extends AccumuloClusterHarness {
 +  private static final Logger log = 
LoggerFactory.getLogger(BulkImportSequentialRowsIT.class);
 +
++  private static final long NR = 24;
++  private static final long NV = 42000;
++
 +  @Override
 +  public int defaultTimeoutSeconds() {
 +return 60;
 +  }
 +
 +  @Override
 +  public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
 +// Need more than one tserver
 +cfg.setNumTservers(2);
 +
 +// use raw local file system so walogs sync and flush will work
 +hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
 +  }
 +
 +  @Test
 +  public void testBulkImportFailure() throws Exception {
 +String tableName = getUniqueNames(1)[0];
 +TableOperations to = getConnector().tableOperations();
 +to.create(tableName);
 +FileSystem fs = getFileSystem();
 +Path rootPath = getUsableDir();
 +Path bulk = new Path(rootPath, "bulk");
 +log.info("bulk: {}", bulk);
 +if (fs.exists(bulk)) {
 +  fs.delete(bulk, true);
 +}
 +assertTrue(fs.mkdirs(bulk));
 +Path err = new Path(rootPath, "err");
 +log.info("err: {}", err);
 +if (fs.exists(err)) {
 +  fs.delete(err, true);
 +}
 +assertTrue(fs.mkdirs(err));
 +
 +Path rfile = new Path(bulk, "file.rf");
- FileSKVWriter writer = 
FileOperations.getInstance().openWriter(rfile.toString(), fs, new 
Configuration(), DefaultConfiguration.getInstance());
- writer.startDefaultLocalityGroup();
- 
- final Value emptyValue = new Value(new byte[0]);
- final SortedSet splits = 

[3/3] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 0ac6ee65f659ce85ddc5d88e2cda6f8aa5537f23
Parents: b16c645 e4f1df3
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Aug 13 12:34:47 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Aug 13 12:34:47 2015 -0400

--
 docs/src/main/asciidoc/chapters/iterator_design.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 56e60ca09d3c056ead1957f205a410a098305f7c
Parents: 24a693b 3622556
Author: Josh Elser els...@apache.org
Authored: Sun Jul 26 19:47:40 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Sun Jul 26 19:47:40 2015 -0400

--
 .../org/apache/accumulo/shell/ShellOptionsJC.java  |  5 +
 .../apache/accumulo/shell/ShellOptionsJCTest.java  | 17 ++---
 2 files changed, 19 insertions(+), 3 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[kturner]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 618003ddebcac170b384c947ba7d185deb37b52f
Parents: eb1ba18 00d8391
Author: Keith Turner ke...@deenlo.com
Authored: Thu Jul 2 13:58:09 2015 -0400
Committer: Keith Turner ke...@deenlo.com
Committed: Thu Jul 2 13:58:09 2015 -0400

--
 .../accumulo/core/client/ScannerBase.java   | 20 
 1 file changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/618003dd/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 560b3a5d1de765ce25d4045972c71f2a9c09be6f
Parents: c088a85 a3722ca
Author: Josh Elser els...@apache.org
Authored: Wed Jul 1 23:28:56 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Jul 1 23:28:56 2015 -0400

--
 assemble/conf/templates/client.conf | 20 
 .../main/asciidoc/chapters/administration.txt   | 25 +++-
 2 files changed, 44 insertions(+), 1 deletion(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: d65f514907b4725a97ca8cdb213969057e82d901
Parents: ad17209 d9e81aa
Author: Josh Elser els...@apache.org
Authored: Fri Jun 26 11:39:19 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Fri Jun 26 11:39:19 2015 -0400

--
 docs/src/main/asciidoc/chapters/clients.txt | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: b8005bef42544e61507722f699149256861c6b59
Parents: c91d713 a0032a9
Author: Josh Elser els...@apache.org
Authored: Tue Jun 23 21:41:33 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Tue Jun 23 21:41:33 2015 -0400

--
 test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b8005bef/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
index 04570a4,000..f752ed5
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
@@@ -1,114 -1,0 +1,114 @@@
 +/*
 + * 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 org.apache.accumulo.core.cli.BatchWriterOpts;
 +import org.apache.accumulo.core.cli.ScannerOpts;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.util.CachedConfiguration;
 +import org.apache.accumulo.harness.AccumuloClusterHarness;
 +import org.apache.accumulo.test.TestIngest;
 +import org.apache.accumulo.test.TestIngest.Opts;
 +import org.apache.accumulo.test.VerifyIngest;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.fs.FileSystem;
 +import org.apache.hadoop.fs.Path;
 +import org.junit.After;
 +import org.junit.Before;
 +import org.junit.Test;
 +
 +public class BulkIT extends AccumuloClusterHarness {
 +
 +  private static final int N = 10;
 +  private static final int COUNT = 5;
 +  private static final BatchWriterOpts BWOPTS = new BatchWriterOpts();
 +  private static final ScannerOpts SOPTS = new ScannerOpts();
 +
 +  @Override
 +  protected int defaultTimeoutSeconds() {
 +return 4 * 60;
 +  }
 +
 +  private Configuration origConf;
 +
 +  @Before
 +  public void saveConf() {
 +origConf = CachedConfiguration.getInstance();
 +  }
 +
 +  @After
 +  public void restoreConf() {
 +if (null != origConf) {
 +  CachedConfiguration.setInstance(origConf);
 +}
 +  }
 +
 +  @Test
 +  public void test() throws Exception {
 +runTest(getConnector(), getCluster().getFileSystem(), 
getCluster().getTemporaryPath(), getAdminPrincipal(), getUniqueNames(1)[0],
 +this.getClass().getName(), testName.getMethodName());
 +  }
 +
 +  static void runTest(Connector c, FileSystem fs, Path basePath, String 
principal, String tableName, String filePrefix, String dirSuffix) throws 
Exception {
 +c.tableOperations().create(tableName);
 +
 +Path base = new Path(basePath, testBulkFail_ + dirSuffix);
 +fs.delete(base, true);
 +fs.mkdirs(base);
 +Path bulkFailures = new Path(base, failures);
 +Path files = new Path(base, files);
 +fs.mkdirs(bulkFailures);
 +fs.mkdirs(files);
 +
 +Opts opts = new Opts();
 +opts.timestamp = 1;
 +opts.random = 56;
 +opts.rows = N;
 +opts.instance = c.getInstance().getInstanceName();
 +opts.cols = 1;
 +opts.setTableName(tableName);
 +opts.conf = new Configuration(false);
 +opts.fs = fs;
 +String fileFormat = filePrefix + rf%02d;
 +for (int i = 0; i  COUNT; i++) {
 +  opts.outputFile = new Path(files, String.format(fileFormat, 
i)).toString();
 +  opts.startRow = N * i;
 +  TestIngest.ingest(c, fs, opts, BWOPTS);
 +}
- opts.outputFile = base + String.format(fileFormat, N);
++opts.outputFile = new Path(files, String.format(fileFormat, 
N)).toString();
 +opts.startRow = N;
 +opts.rows = 1;
 +// create an rfile with one entry, 

[3/3] accumulo git commit: Merge branch '1.7'

[billie]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 455b99aa050c00e28db2856fea42aef6888168ee
Parents: 3fe4f69 5312fac
Author: Billie Rinaldi bil...@apache.org
Authored: Thu Jun 11 13:30:00 2015 -0700
Committer: Billie Rinaldi bil...@apache.org
Committed: Thu Jun 11 13:30:00 2015 -0700

--
 .../conf/CredentialProviderFactoryShim.java | 24 +---
 1 file changed, 11 insertions(+), 13 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 7b4a3b8ab23f7724695325cf5c41f0dec05d8083
Parents: f1d1fce 699b8bf
Author: Josh Elser els...@apache.org
Authored: Thu Jun 11 18:37:51 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jun 11 18:37:51 2015 -0400

--
 .../master/tserverOps/ShutdownTServer.java  |  1 +
 .../master/tableOps/ShutdownTServerTest.java| 82 
 2 files changed, 83 insertions(+)
--

[3/3] accumulo git commit: Merge branch '1.7'

[billie]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 3fe4f690b59cd9cf33172c5638986c90cb634b9d
Parents: a5e4ae8 724bfb3
Author: Billie Rinaldi bil...@apache.org
Authored: Wed Jun 10 18:10:21 2015 -0700
Committer: Billie Rinaldi bil...@apache.org
Committed: Wed Jun 10 18:10:21 2015 -0700

--
 .../conf/CredentialProviderFactoryShim.java | 24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: f93803ff631c4a239bf68ae211ff51927680a06d
Parents: 0844914 e16a6fa
Author: Josh Elser els...@apache.org
Authored: Mon Jun 8 13:13:53 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon Jun 8 13:13:53 2015 -0400

--
 .../org/apache/accumulo/test/functional/KerberosProxyIT.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f93803ff/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 31d1329,000..fd89b2f
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,426 -1,0 +1,426 @@@
 +/*
 + * 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 final Logger log = 

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: f1d0ec93d9f13ff84844b5ac81e4a7b383ced467
Parents: 1ae4655 f629d32
Author: Josh Elser els...@apache.org
Authored: Sat Jun 6 01:26:50 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Sat Jun 6 01:26:50 2015 -0400

--
 .../accumulo/test/functional/ReadWriteIT.java   | 56 +++-
 1 file changed, 55 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1d0ec93/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index 4ef2958,000..d048071
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@@ -1,456 -1,0 +1,510 @@@
 +/*
 + * 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 org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
 +import static org.junit.Assert.assertNotNull;
 +import static org.junit.Assert.assertTrue;
 +
 +import java.io.ByteArrayOutputStream;
++import java.io.File;
 +import java.io.IOException;
 +import java.io.PrintStream;
 +import java.net.URL;
++import java.security.SecureRandom;
++import java.security.cert.CertificateException;
++import java.security.cert.X509Certificate;
 +import java.util.ArrayList;
 +import java.util.Collections;
 +import java.util.HashSet;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Set;
 +import java.util.TreeMap;
 +import java.util.concurrent.Callable;
 +import java.util.concurrent.ExecutorService;
 +import java.util.concurrent.Executors;
 +import java.util.concurrent.Future;
 +import java.util.concurrent.TimeUnit;
 +import java.util.concurrent.atomic.AtomicBoolean;
 +
++import javax.net.ssl.HostnameVerifier;
++import javax.net.ssl.HttpsURLConnection;
++import javax.net.ssl.KeyManager;
++import javax.net.ssl.SSLContext;
++import javax.net.ssl.SSLSession;
++import javax.net.ssl.TrustManager;
++import javax.net.ssl.X509TrustManager;
++
 +import org.apache.accumulo.cluster.ClusterControl;
 +import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster;
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.cli.BatchWriterOpts;
 +import org.apache.accumulo.core.cli.ScannerOpts;
 +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.ClientConfiguration;
 +import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
 +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.admin.TableOperations;
 +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.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.file.rfile.PrintInfo;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
 +import org.apache.accumulo.core.security.Authorizations;
 

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 428b5b78192c5ec2e696d5a4e2555b69f426d8c2
Parents: 01ae5b8 884165d
Author: Josh Elser els...@apache.org
Authored: Thu Jun 4 18:03:19 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jun 4 18:03:19 2015 -0400

--
 .../base/src/main/java/org/apache/accumulo/server/util/Admin.java  | 2 +-
 .../main/java/org/apache/accumulo/test/functional/ShutdownIT.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/428b5b78/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
index f27ee02,000..06399d8
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
@@@ -1,121 -1,0 +1,122 @@@
 +/*
 + * 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 org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
 +
 +import java.io.IOException;
 +import java.util.List;
 +import java.util.concurrent.atomic.AtomicReference;
 +
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.util.UtilWaitThread;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
 +import org.apache.accumulo.server.util.Admin;
 +import org.apache.accumulo.test.TestIngest;
 +import org.apache.accumulo.test.TestRandomDeletes;
 +import org.apache.accumulo.test.VerifyIngest;
 +import org.junit.Test;
 +
 +public class ShutdownIT extends ConfigurableMacBase {
 +
 +  @Override
 +  protected int defaultTimeoutSeconds() {
 +return 2 * 60;
 +  }
 +
 +  @Test
 +  public void shutdownDuringIngest() throws Exception {
 +Process ingest = cluster.exec(TestIngest.class, -i, 
cluster.getInstanceName(), -z, cluster.getZooKeepers(), -u, root, -p, 
ROOT_PASSWORD,
 +--createTable);
 +UtilWaitThread.sleep(100);
 +assertEquals(0, cluster.exec(Admin.class, stopAll).waitFor());
 +ingest.destroy();
 +  }
 +
 +  @Test
 +  public void shutdownDuringQuery() throws Exception {
 +assertEquals(0,
 +cluster.exec(TestIngest.class, -i, cluster.getInstanceName(), -z, 
cluster.getZooKeepers(), -u, root, -p, ROOT_PASSWORD, --createTable)
 +.waitFor());
 +Process verify = cluster.exec(VerifyIngest.class, -i, 
cluster.getInstanceName(), -z, cluster.getZooKeepers(), -u, root, -p, 
ROOT_PASSWORD);
 +UtilWaitThread.sleep(100);
 +assertEquals(0, cluster.exec(Admin.class, stopAll).waitFor());
 +verify.destroy();
 +  }
 +
 +  @Test
 +  public void shutdownDuringDelete() throws Exception {
 +assertEquals(0,
 +cluster.exec(TestIngest.class, -i, cluster.getInstanceName(), -z, 
cluster.getZooKeepers(), -u, root, -p, ROOT_PASSWORD, --createTable)
 +.waitFor());
 +Process deleter = cluster.exec(TestRandomDeletes.class, -i, 
cluster.getInstanceName(), -z, cluster.getZooKeepers(), -u, root, -p, 
ROOT_PASSWORD);
 +UtilWaitThread.sleep(100);
 +assertEquals(0, cluster.exec(Admin.class, stopAll).waitFor());
 +deleter.destroy();
 +  }
 +
 +  @Test
 +  public void shutdownDuringDeleteTable() throws Exception {
 +final Connector c = getConnector();
 +for (int i = 0; i  10; i++) {
 +  c.tableOperations().create(table + i);
 +}
 +final AtomicReferenceException ref = new AtomicReferenceException();
 +Thread async = new Thread() {
 +  @Override
 +  public void run() {
 +try {
 +  for (int i = 0; i  10; i++)
 +c.tableOperations().delete(table + i);
 

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: fe97d5111f3172a94dfd6e98749f550b22d66a18
Parents: e88f642 3289940
Author: Josh Elser els...@apache.org
Authored: Mon Jun 1 01:40:43 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon Jun 1 01:40:43 2015 -0400

--
 .../delegation/AuthenticationTokenSecretManager.java |  5 -
 .../delegation/ZooAuthenticationKeyDistributor.java  | 15 ---
 2 files changed, 12 insertions(+), 8 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 72d83acd29b2b208dc5dd81ff4758d3cfff570bd
Parents: 071f6fe 84d614d
Author: Josh Elser els...@apache.org
Authored: Thu May 28 16:18:57 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu May 28 16:18:57 2015 -0400

--
 .../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 17646af60e5275f0254c72d078b7de96cbb51e2d
Parents: 302617d afdd2e6
Author: Josh Elser els...@apache.org
Authored: Thu May 28 23:02:11 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu May 28 23:02:11 2015 -0400

--
 .../org/apache/accumulo/core/rpc/SaslConnectionParams.java   | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 8c1d2d0c147220ca375006a8a7e7e481241651a7
Parents: ae2255c f9a29c7
Author: Josh Elser els...@apache.org
Authored: Wed May 27 23:06:51 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 27 23:06:51 2015 -0400

--
 .../org/apache/accumulo/test/functional/DurabilityIT.java   | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 342b6b3028e29f1496de5f8e00fe0a1363e74bba
Parents: ca5928e ef902f2
Author: Josh Elser josh.el...@gmail.com
Authored: Tue May 26 17:09:08 2015 -0400
Committer: Josh Elser josh.el...@gmail.com
Committed: Tue May 26 17:09:08 2015 -0400

--
 .../tserver/replication/AccumuloReplicaSystem.java  | 16 ++--
 .../tserver/replication/ReplicationProcessor.java   |  4 +++-
 2 files changed, 13 insertions(+), 7 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 43c38316514ec840a3f648ffe082fce244d884e7
Parents: 7eeb4e6 24ea8d1
Author: Josh Elser josh.el...@gmail.com
Authored: Fri May 22 19:56:02 2015 -0400
Committer: Josh Elser josh.el...@gmail.com
Committed: Fri May 22 19:56:02 2015 -0400

--
 proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 5 +
 1 file changed, 5 insertions(+)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 7eeb4e6ab144dfd0846292921ded2a7b85b1f642
Parents: 65267bc a39e7d1
Author: Josh Elser josh.el...@gmail.com
Authored: Fri May 22 14:04:13 2015 -0400
Committer: Josh Elser josh.el...@gmail.com
Committed: Fri May 22 14:04:13 2015 -0400

--
 .../standalone/StandaloneClusterControl.java| 27 +++-
 .../StandaloneClusterControlTest.java   | 44 
 2 files changed, 61 insertions(+), 10 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 19bacd2922e4cf752c2b1b0fc4dfdfd891b29dec
Parents: 350b491 2eeaebb
Author: Josh Elser els...@apache.org
Authored: Thu May 21 22:45:33 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu May 21 22:45:33 2015 -0400

--
 .../accumulo/test/functional/DurabilityIT.java  | 44 +---
 1 file changed, 29 insertions(+), 15 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 65267bc7c93a6b81eba60debe8194b83fb409f1f
Parents: bf97910 8542773
Author: Josh Elser josh.el...@gmail.com
Authored: Fri May 22 00:52:32 2015 -0400
Committer: Josh Elser josh.el...@gmail.com
Committed: Fri May 22 00:52:32 2015 -0400

--
 server/native/pom.xml | 4 
 1 file changed, 4 insertions(+)
--


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

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: bf979109a34fed5257ba3e45003242bfec99c1db
Parents: 19bacd2 76547d4
Author: Josh Elser els...@apache.org
Authored: Fri May 22 00:01:58 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Fri May 22 00:01:58 2015 -0400

--
 .../accumulo/test/proxy/SimpleProxyBase.java| 57 ++--
 1 file changed, 42 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/bf979109/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
--
diff --cc test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
index 58ac1e2,000..6828c40
mode 100644,00..100644
--- a/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
+++ b/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
@@@ -1,1879 -1,0 +1,1906 @@@
 +/*
 + * 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.proxy;
 +
 +import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
 +import static org.junit.Assert.assertNotEquals;
 +import static org.junit.Assert.assertNotNull;
 +import static org.junit.Assert.assertTrue;
 +import static org.junit.Assert.fail;
 +
 +import java.io.BufferedReader;
 +import java.io.File;
 +import java.io.InputStreamReader;
 +import java.nio.ByteBuffer;
 +import java.nio.file.Files;
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.EnumSet;
 +import java.util.HashMap;
 +import java.util.HashSet;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Properties;
 +import java.util.Set;
 +import java.util.TreeMap;
 +import java.util.UUID;
 +
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 +import org.apache.accumulo.core.conf.DefaultConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.file.FileOperations;
 +import org.apache.accumulo.core.file.FileSKVWriter;
 +import org.apache.accumulo.core.iterators.DevNull;
 +import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 +import org.apache.accumulo.core.iterators.user.SummingCombiner;
 +import org.apache.accumulo.core.iterators.user.VersioningIterator;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.core.util.ByteBufferUtil;
 +import org.apache.accumulo.core.util.UtilWaitThread;
 +import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint;
 +import org.apache.accumulo.harness.SharedMiniClusterIT;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
 +import org.apache.accumulo.proxy.Proxy;
 +import org.apache.accumulo.proxy.thrift.AccumuloProxy.Client;
 +import org.apache.accumulo.proxy.thrift.AccumuloSecurityException;
 +import org.apache.accumulo.proxy.thrift.ActiveCompaction;
 +import org.apache.accumulo.proxy.thrift.ActiveScan;
 +import org.apache.accumulo.proxy.thrift.BatchScanOptions;
 +import org.apache.accumulo.proxy.thrift.Column;
 +import org.apache.accumulo.proxy.thrift.ColumnUpdate;
 +import org.apache.accumulo.proxy.thrift.CompactionReason;
 +import org.apache.accumulo.proxy.thrift.CompactionStrategyConfig;
 +import org.apache.accumulo.proxy.thrift.CompactionType;
 +import org.apache.accumulo.proxy.thrift.Condition;
 +import org.apache.accumulo.proxy.thrift.ConditionalStatus;
 +import org.apache.accumulo.proxy.thrift.ConditionalUpdates;
 +import 

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'

Conflicts:

test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java


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

Branch: refs/heads/master
Commit: cf9b9a4ea6cfd03a053e64c7feca964ca9c026aa
Parents: 9cd8273 81fdad8
Author: Josh Elser els...@apache.org
Authored: Thu May 21 00:03:56 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu May 21 00:03:56 2015 -0400

--
 .../test/replication/ReplicationIT.java | 93 +++-
 1 file changed, 50 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cf9b9a4e/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
--
diff --cc 
test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
index 54b42f4,e2ee215..ef81f2c
--- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@@ -132,32 -130,21 +133,33 @@@ public class ReplicationIT extends Conf
}
  
private MultimapString,String getLogs(Connector conn) throws 
TableNotFoundException {
 -MultimapString,String logs = HashMultimap.create();
 +// Map of server to tableId
 +MultimapTServerInstance,String serverToTableID = HashMultimap.create();
  Scanner scanner = conn.createScanner(MetadataTable.NAME, 
Authorizations.EMPTY);
 -scanner.fetchColumnFamily(LogColumnFamily.NAME);
 -scanner.setRange(new Range());
 +scanner.setRange(MetadataSchema.TabletsSection.getRange());
 +
scanner.fetchColumnFamily(MetadataSchema.TabletsSection.CurrentLocationColumnFamily.NAME);
 +for (EntryKey,Value entry : scanner) {
 +  TServerInstance key = new TServerInstance(entry.getValue(), 
entry.getKey().getColumnQualifier());
 +  byte[] tableId = KeyExtent.tableOfMetadataRow(entry.getKey().getRow());
 +  serverToTableID.put(key, new String(tableId, UTF_8));
 +}
 +// Map of logs to tableId
 +MultimapString,String logs = HashMultimap.create();
 +scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
 +scanner.setRange(MetadataSchema.CurrentLogsSection.getRange());
  for (EntryKey,Value entry : scanner) {
if (Thread.interrupted()) {
+ Thread.currentThread().interrupt();
  return logs;
}
 -
 -  LogEntry logEntry = LogEntry.fromKeyValue(entry.getKey(), 
entry.getValue());
 -
 -  for (String log : logEntry.logSet) {
 -// Need to normalize the log file from LogEntry
 -logs.put(new Path(log).toString(), 
logEntry.extent.getTableId().toString());
 +  Text path = new Text();
 +  MetadataSchema.CurrentLogsSection.getPath(entry.getKey(), path);
 +  Text session = new Text();
 +  Text hostPort = new Text();
 +  MetadataSchema.CurrentLogsSection.getTabletServer(entry.getKey(), 
hostPort, session);
 +  TServerInstance server = new 
TServerInstance(AddressUtil.parseAddress(hostPort.toString(), false), 
session.toString());
 +  for (String tableId : serverToTableID.get(server)) {
 +logs.put(new Path(path.toString()).toString(), tableId);
}
  }
  return logs;
@@@ -575,12 -638,12 +603,13 @@@
  
  // We should have *some* reference to each log that was seen in the 
metadata table
  // They might not yet all be closed though (might be newfile)
 -Assert.assertEquals(Metadata log distribution:  + logs, logs.keySet(), 
replFiles);
 +Assert.assertTrue(Metadata log distribution:  + logs + replFiles  + 
replFiles, logs.keySet().containsAll(replFiles));
 +Assert.assertTrue(Difference between replication entries and current 
logs is bigger than one, logs.keySet().size() - replFiles.size() = 1);
  
+ final Configuration conf = new Configuration();
  for (String replFile : replFiles) {
Path p = new Path(replFile);
-   FileSystem fs = p.getFileSystem(new Configuration());
+   FileSystem fs = p.getFileSystem(conf);
Assert.assertTrue(File does not exist anymore, it was likely 
incorrectly garbage collected:  + p, fs.exists(p));
  }
}
@@@ -631,53 -694,59 +660,31 @@@
  conn.securityOperations().grantTablePermission(root, 
ReplicationTable.NAME, TablePermission.WRITE);
  conn.tableOperations().deleteRows(ReplicationTable.NAME, null, null);
  
- final AtomicBoolean keepRunning = new AtomicBoolean(true);
- final SetString metadataWals = new HashSet();
- 
- Thread t = new Thread(new Runnable() {
-   @Override
-   public void 

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: e22103ca9920b734c46f5d4fa0f5fb36c01548e5
Parents: 96733f7 ed5b53b
Author: Josh Elser josh.el...@gmail.com
Authored: Tue May 19 17:24:38 2015 -0400
Committer: Josh Elser josh.el...@gmail.com
Committed: Tue May 19 17:24:38 2015 -0400

--
 .../accumulo/test/functional/ConstraintIT.java  | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: e163c34b7794da649dc6056b89d5a4b1f8d910ac
Parents: 61f9279 965d4a8
Author: Josh Elser els...@apache.org
Authored: Mon May 18 15:11:26 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon May 18 15:11:26 2015 -0400

--
 .../standalone/StandaloneAccumuloCluster.java   | 12 +++--
 .../standalone/StandaloneClusterControl.java| 25 +
 .../StandaloneAccumuloClusterTest.java  | 53 
 3 files changed, 86 insertions(+), 4 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: b3c131f9f540d3b8011796231be37d63b1a2f665
Parents: e163c34 5b76afc
Author: Josh Elser els...@apache.org
Authored: Mon May 18 16:53:08 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon May 18 16:53:08 2015 -0400

--
 docs/src/main/asciidoc/chapters/administration.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 96733f7e0b11867ad1c66b86e38f7118e115b5f5
Parents: 3b39a9e f3c1c3f
Author: Josh Elser els...@apache.org
Authored: Tue May 19 00:25:12 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Tue May 19 00:25:12 2015 -0400

--

--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: f98ddc2a727684edd16e225d7e7eebfcc50de69c
Parents: 651c6ae c85361a
Author: Josh Elser els...@apache.org
Authored: Thu May 14 13:17:39 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu May 14 13:17:39 2015 -0400

--
 .../test/randomwalk/multitable/CopyTable.java   |  3 ++
 .../test/randomwalk/multitable/CopyTool.java| 56 +++-
 2 files changed, 57 insertions(+), 2 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 11fb44298230a5e8abb52e5cbdd4611e3020cb53
Parents: dbea798 2b96dee
Author: Josh Elser els...@apache.org
Authored: Wed May 13 22:53:45 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 13 22:53:45 2015 -0400

--
 .../accumulo/cluster/standalone/StandaloneClusterControlTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 81302d398f4f6e8c5b6b7581638a65efe5a22c9a
Parents: 11fb442 b347440
Author: Josh Elser els...@apache.org
Authored: Thu May 14 01:30:04 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu May 14 01:30:04 2015 -0400

--
 docs/src/main/asciidoc/chapters/kerberos.txt | 83 +++
 1 file changed, 53 insertions(+), 30 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 2a9aa00651239b431d70be9bbb84502999005faa
Parents: ca7cad8 1c6e4b6
Author: Josh Elser els...@apache.org
Authored: Mon May 11 11:09:41 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon May 11 11:09:41 2015 -0400

--
 .../japi-compliance/japi-accumulo-1.7.0.xml | 38 
 1 file changed, 38 insertions(+)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 781bdf1ee2e93be18a12f5c388658d384ca0f7b7
Parents: 2a9aa00 b9b0889
Author: Josh Elser els...@apache.org
Authored: Mon May 11 11:10:46 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon May 11 11:10:46 2015 -0400

--
 test/src/main/java/org/apache/accumulo/test/randomwalk/Node.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: cea170014acb6c6588c0d51b27fd0e3bff970dfd
Parents: 8ccd7e7 6da1fb1
Author: Josh Elser els...@apache.org
Authored: Mon May 11 20:38:08 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon May 11 20:38:08 2015 -0400

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 0454d9f714962ee9abe1c5a4e438aba8d22c4107
Parents: cea1700 cfa7a8e
Author: Josh Elser els...@apache.org
Authored: Mon May 11 21:41:03 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon May 11 21:41:03 2015 -0400

--
 UPGRADING.md | 106 ++
 1 file changed, 106 insertions(+)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: bc4874ca68fbe067538038bd580e01095364ad27
Parents: 988c3c1 9546b10
Author: Josh Elser els...@apache.org
Authored: Mon May 11 12:44:41 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon May 11 12:44:41 2015 -0400

--
 CHANGES | 703 +++
 1 file changed, 703 insertions(+)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: ca7cad87599bd789ed95b2c0645e23fd73a03110
Parents: 411f87a 2807c14
Author: Josh Elser els...@apache.org
Authored: Sun May 10 20:23:41 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Sun May 10 20:23:41 2015 -0400

--
 test/system/continuous/start-agitator.sh | 8 
 test/system/continuous/stop-agitator.sh  | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 411f87a93fec4dedc1699d271a6a806c80141595
Parents: 688fa04 67effa0
Author: Josh Elser els...@apache.org
Authored: Sun May 10 18:29:25 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Sun May 10 18:29:25 2015 -0400

--
 .../client/lexicoder/BigIntegerLexicoder.java |  6 +-
 .../core/client/lexicoder/DateLexicoder.java  |  6 +-
 .../core/client/lexicoder/DoubleLexicoder.java|  6 +-
 .../core/client/lexicoder/IntegerLexicoder.java   |  6 +-
 .../core/client/lexicoder/ListLexicoder.java  |  6 +-
 .../core/client/lexicoder/PairLexicoder.java  |  6 +-
 .../core/client/lexicoder/StringLexicoder.java|  6 +-
 .../core/client/lexicoder/TextLexicoder.java  |  6 +-
 .../core/client/lexicoder/UIntegerLexicoder.java  |  6 +-
 .../core/client/lexicoder/ULongLexicoder.java |  6 +-
 .../core/client/lexicoder/UUIDLexicoder.java  |  6 +-
 .../accumulo/core/iterators/LongCombiner.java | 18 +++---
 .../core/iterators/user/BigDecimalCombiner.java   |  6 +-
 .../core/iterators/user/SummingArrayCombiner.java | 12 ++--
 14 files changed, 17 insertions(+), 85 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 6acfd4149bcc3bebdd2245771f6ceffa9b3d601f
Parents: 1343003 931bf89
Author: Josh Elser els...@apache.org
Authored: Thu May 7 13:57:52 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu May 7 13:57:52 2015 -0400

--
 .../apache/accumulo/tserver/log/DfsLogger.java  | 14 +++--
 .../tserver/log/TabletServerLogger.java | 32 +---
 2 files changed, 40 insertions(+), 6 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 68b8cd7c9169c1d2e8eabfb84c9d977c8acc8973
Parents: bc3dc3b a8ef75e
Author: Josh Elser els...@apache.org
Authored: Thu May 7 17:05:34 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu May 7 17:05:34 2015 -0400

--
 .../core/client/ClientConfiguration.java|  4 ++
 .../java/org/apache/accumulo/shell/Shell.java   | 40 +---
 .../apache/accumulo/shell/ShellOptionsJC.java   | 11 ++
 .../apache/accumulo/shell/ShellConfigTest.java  | 36 ++
 .../accumulo/shell/ShellSetInstanceTest.java| 15 +---
 5 files changed, 87 insertions(+), 19 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 5b7a14eb51d66b24f1b3d3a8cf6f45f71eb02e4a
Parents: 6760c5c f830300
Author: Christopher Tubbs ctubb...@apache.org
Authored: Wed May 6 18:55:33 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Wed May 6 18:55:33 2015 -0400

--
 core/src/main/java/org/apache/accumulo/core/data/Mutation.java  | 3 ++-
 .../org/apache/accumulo/server/fs/PreferredVolumeChooser.java   | 5 -
 .../java/org/apache/accumulo/server/replication/StatusUtil.java | 2 +-
 .../master/replication/RemoveCompleteReplicationRecords.java| 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: adacc2e5a096d0c463e3027d386b945e5cc0cfaa
Parents: 46f7602 dfa5255
Author: Josh Elser els...@apache.org
Authored: Wed May 6 17:06:26 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 6 17:06:26 2015 -0400

--
 .../iterators/user/RowEncodingIterator.java |  56 +-
 .../core/iterators/user/WholeRowIterator.java   |   7 -
 .../iterators/user/RowEncodingIteratorTest.java | 201 +++
 3 files changed, 253 insertions(+), 11 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: e7fc66caa9fbe20d35eaf3f2a9082c5119bbcf83
Parents: e25146d 2436eec
Author: Josh Elser els...@apache.org
Authored: Fri May 1 16:40:03 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Fri May 1 16:40:03 2015 -0400

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

[3/3] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: ae4fd486d75a5d80501f18132a97ebf25f852fcf
Parents: bcc79d0 ef2e31a
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 11:27:41 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 11:27:41 2015 -0400

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

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 2e336b8326f8c297acd635890b4579350a7a3659
Parents: 5bf2dab 4258886
Author: Josh Elser els...@apache.org
Authored: Tue Apr 28 20:09:36 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Tue Apr 28 20:09:36 2015 -0400

--
 server/native/pom.xml | 1 +
 server/native/src/main/resources/Makefile | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


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

[3/3] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: bcc79d0062644917ca2bca4c90c25f2a541cb6b5
Parents: a7de08b c55fe3e
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue Apr 28 22:09:40 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Apr 28 22:09:40 2015 -0400

--
 .../accumulo/examples/simple/client/RandomBatchScanner.java   | 2 +-
 .../apache/accumulo/server/rpc/TNonblockingServerSocket.java  | 2 +-
 .../apache/accumulo/server/security/SecurityOperation.java| 3 +--
 .../accumulo/server/security/handler/ZKPermHandler.java   | 5 +
 .../java/org/apache/accumulo/server/util/TableDiskUsage.java  | 2 +-
 .../org/apache/accumulo/master/tableOps/ClonePermissions.java | 4 ++--
 .../org/apache/accumulo/master/tableOps/CompactRange.java | 3 +++
 .../java/org/apache/accumulo/master/tableOps/CopyFailed.java  | 7 +--
 .../java/org/apache/accumulo/master/tableOps/ImportTable.java | 4 
 .../java/org/apache/accumulo/master/tableOps/LoadFiles.java   | 6 +++---
 .../apache/accumulo/master/tableOps/MapImportFileNames.java   | 5 -
 .../java/org/apache/accumulo/master/tableOps/MasterRepo.java  | 3 ---
 .../apache/accumulo/master/tableOps/MoveExportedFiles.java| 5 -
 .../accumulo/master/tableOps/PopulateMetadataTable.java   | 5 -
 .../accumulo/master/tableOps/SetupNamespacePermissions.java   | 4 ++--
 .../org/apache/accumulo/master/tableOps/SetupPermissions.java | 4 ++--
 .../org/apache/accumulo/master/tableOps/TableRangeOp.java | 3 +++
 .../org/apache/accumulo/master/tableOps/TableRangeOpWait.java | 5 -
 .../main/java/org/apache/accumulo/master/tableOps/Utils.java  | 4 ++--
 .../java/org/apache/accumulo/tserver/scan/NextBatchTask.java  | 2 +-
 20 files changed, 48 insertions(+), 30 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 5bf2dab257bfb27c3b8b5a52f85c1c19d8ba5c8b
Parents: e9ad534 7891404
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue Apr 28 11:38:05 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Apr 28 11:38:05 2015 -0400

--
 core/pom.xml |  8 
 pom.xml  | 16 +---
 2 files changed, 5 insertions(+), 19 deletions(-)
--


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

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

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: e9ad5345f7e009e055fd74b3c33ec5225c55291a
Parents: cf0bcb3 481b119
Author: Josh Elser els...@apache.org
Authored: Mon Apr 27 23:11:23 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon Apr 27 23:11:23 2015 -0400

--
 .../core/iterators/SortedKeyValueIterator.java  |  8 ++
 .../main/asciidoc/chapters/iterator_design.txt  | 27 +++-
 2 files changed, 29 insertions(+), 6 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 6df71693ee3cab71a51860d3ad0d9b25ec661263
Parents: a72b0d3 ea25e98
Author: Josh Elser els...@apache.org
Authored: Thu Apr 23 23:57:32 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Apr 23 23:57:32 2015 -0400

--
 .../accumulo/cluster/standalone/StandaloneClusterControl.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: a72b0d39ad566ede89fbf06a6247c4d6e791166d
Parents: de715e7 523d11b
Author: Josh Elser els...@apache.org
Authored: Thu Apr 23 21:15:04 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Apr 23 21:15:04 2015 -0400

--

--

[3/3] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 9abf6a31810a5bf5823032e5823879c210b191d2
Parents: fd9bb3a d26fc14
Author: Christopher Tubbs ctubb...@apache.org
Authored: Wed Apr 22 13:23:44 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Wed Apr 22 13:23:44 2015 -0400

--
 .../core/client/MutationsRejectedException.java   | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[billie]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 7d2eb6711632c3766fe42d64c160b8687e08ca45
Parents: 321f573 61b76b5
Author: Billie Rinaldi bil...@apache.org
Authored: Tue Apr 21 12:42:06 2015 -0700
Committer: Billie Rinaldi bil...@apache.org
Committed: Tue Apr 21 12:42:06 2015 -0700

--
 .../apache/accumulo/core/cli/ClientOpts.java|  5 +-
 .../core/client/ClientConfiguration.java| 42 +++-
 .../core/client/ClientConfigurationTest.java| 51 ++--
 .../src/test/resources/multi-valued.client.conf | 17 +++
 .../minicluster/MiniAccumuloInstance.java   |  5 +-
 .../org/apache/accumulo/proxy/ProxyServer.java  |  3 +-
 .../apache/accumulo/shell/ShellOptionsJC.java   |  4 +-
 .../StandaloneAccumuloClusterConfiguration.java |  3 +-
 .../org/apache/accumulo/test/ShellServerIT.java |  3 +-
 .../test/functional/ConfigurableMacIT.java  |  3 +-
 10 files changed, 116 insertions(+), 20 deletions(-)
--

[3/3] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 33ef1e027643b3e9cfa82b9b2a4e7c48353d3f7f
Parents: 4e88af7 f76acc6
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue Apr 21 19:31:49 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Apr 21 19:31:49 2015 -0400

--
 core/pom.xml| 2 +-
 minicluster/pom.xml | 2 +-
 pom.xml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
--


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

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

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