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

Branch: refs/heads/master
Commit: a605d22513e1b75ae534a3457590545daa9df22a
Parents: c8e6fe7 523e790
Author: Josh Elser 
Authored: Mon Apr 25 11:12:39 2016 -0400
Committer: Josh Elser 
Committed: Mon Apr 25 11:12:39 2016 -0400

--
 .../start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java  | 1 +
 1 file changed, 1 insertion(+)
--

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

Branch: refs/heads/master
Commit: d1cb53b16cb498e03c7e8d460eb613e78d2e5331
Parents: 6fbf2d2 18caa5b
Author: Christopher Tubbs 
Authored: Sun Apr 17 13:06:52 2016 -0400
Committer: Christopher Tubbs 
Committed: Sun Apr 17 13:06:52 2016 -0400

--
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)
--

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

Branch: refs/heads/master
Commit: a6133a6ae936cc19aaae684c68f6e81c56e0a6dc
Parents: 32a3bef d9e9d66
Author: Christopher Tubbs 
Authored: Tue Apr 12 15:08:29 2016 -0400
Committer: Christopher Tubbs 
Committed: Tue Apr 12 15:08:29 2016 -0400

--

--

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

Branch: refs/heads/master
Commit: 35252694b9f17fd5aec119b9799b641d665d92d9
Parents: 16c36b8 0cb15fa
Author: Christopher Tubbs 
Authored: Thu Apr 7 14:31:15 2016 -0400
Committer: Christopher Tubbs 
Committed: Thu Apr 7 14:31:15 2016 -0400

--
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--

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

Branch: refs/heads/master
Commit: 52318429a609ffa72fbce621134a111ef7bd4bac
Parents: 8839fe5 f7a24d7
Author: Josh Elser 
Authored: Tue Apr 5 11:19:48 2016 -0400
Committer: Josh Elser 
Committed: Tue Apr 5 11:23:01 2016 -0400

--
 .../core/client/impl/TabletServerBatchWriter.java  | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/52318429/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 35281d6,77d8307..459d230
--- 
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
@@@ -843,10 -847,15 +845,15 @@@ public class TabletServerBatchWriter 
  try {
  
long count = 0;
-   for (List list : mutationBatch.values()) {
- count += list.size();
+ 
 -  Set tableIds = new TreeSet();
++  Set tableIds = new TreeSet<>();
+   for (Map.Entry> entry : 
mutationBatch.entrySet()) {
+ count += entry.getValue().size();
+ tableIds.add(entry.getKey().getTableId());
}
-   String msg = "sending " + String.format("%,d", count) + " mutations 
to " + String.format("%,d", mutationBatch.size()) + " tablets at " + location;
+ 
+   String msg = "sending " + String.format("%,d", count) + " mutations 
to " + String.format("%,d", mutationBatch.size()) + " tablets at " + location
+   + " tids: [" + Joiner.on(',').join(tableIds) + ']';
Thread.currentThread().setName(msg);
  
Span span = Trace.start("sendMutations");

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

[elserj]

Merge branch '1.7'

Conflicts:

server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java


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

Branch: refs/heads/master
Commit: 0dd1d6a54f8ff25188e695c1fca8f1139559
Parents: 02450e4 f181cf6
Author: Josh Elser 
Authored: Fri Apr 1 12:52:15 2016 -0400
Committer: Josh Elser 
Committed: Fri Apr 1 12:52:15 2016 -0400

--
 .../apache/accumulo/tserver/InMemoryMap.java|  23 +-
 .../org/apache/accumulo/tserver/MemKey.java |  10 +-
 .../accumulo/tserver/MemKeyComparator.java  |   2 +-
 .../org/apache/accumulo/tserver/NativeMap.java  |  27 +-
 .../PartialMutationSkippingIterator.java|   2 +-
 .../org/apache/accumulo/test/InMemoryMapIT.java | 361 +++
 6 files changed, 401 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0dd1d6a5/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
index f5141ff,72f84b5..1b02f14
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
@@@ -91,58 -79,43 +92,65 @@@ public class InMemoryMap 
  
private Map> lggroups;
  
 +  private static Pair 
getSampler(AccumuloConfiguration config) {
 +try {
 +  SamplerConfigurationImpl sampleConfig = 
SamplerConfigurationImpl.newSamplerConfig(config);
 +  if (sampleConfig == null) {
 +return new Pair<>(null, null);
 +  }
 +
 +  return new Pair<>(sampleConfig, SamplerFactory.newSampler(sampleConfig, 
config));
 +} catch (IOException e) {
 +  throw new RuntimeException(e);
 +}
 +  }
 +
+   public static final String TYPE_NATIVE_MAP_WRAPPER = "NativeMapWrapper";
+   public static final String TYPE_DEFAULT_MAP = "DefaultMap";
+   public static final String TYPE_LOCALITY_GROUP_MAP = "LocalityGroupMap";
+   public static final String TYPE_LOCALITY_GROUP_MAP_NATIVE = 
"LocalityGroupMap with native";
+ 
 -  public InMemoryMap(boolean useNativeMap, String memDumpDir) {
 -this(new HashMap>(), useNativeMap, memDumpDir);
 +  private AtomicReference> samplerRef 
= new AtomicReference<>(null);
 +
 +  private AccumuloConfiguration config;
 +
 +  // defer creating sampler until first write. This was done because an empty 
sample map configured with no sampler will not flush after a user changes sample
 +  // config.
 +  private Sampler getOrCreateSampler() {
 +Pair pair = samplerRef.get();
 +if (pair == null) {
 +  pair = getSampler(config);
 +  if (!samplerRef.compareAndSet(null, pair)) {
 +pair = samplerRef.get();
 +  }
 +}
 +
 +return pair.getSecond();
}
  
 -  public InMemoryMap(Map> lggroups, boolean 
useNativeMap, String memDumpDir) {
 -this.memDumpDir = memDumpDir;
 -this.lggroups = lggroups;
 +  public InMemoryMap(AccumuloConfiguration config) throws 
LocalityGroupConfigurationError {
 +
 +boolean useNativeMap = 
config.getBoolean(Property.TSERV_NATIVEMAP_ENABLED);
 +
 +this.memDumpDir = config.get(Property.TSERV_MEMDUMP_DIR);
 +this.lggroups = LocalityGroupUtil.getLocalityGroups(config);
 +
 +this.config = config;
 +
 +SimpleMap allMap;
 +SimpleMap sampleMap;
  
  if (lggroups.size() == 0) {
 -  map = newMap(useNativeMap);
 +  allMap = newMap(useNativeMap);
 +  sampleMap = newMap(useNativeMap);
+   mapType = useNativeMap ? TYPE_NATIVE_MAP_WRAPPER : TYPE_DEFAULT_MAP;
  } else {
 -  map = new LocalityGroupMap(lggroups, useNativeMap);
 +  allMap = new LocalityGroupMap(lggroups, useNativeMap);
 +  sampleMap = new LocalityGroupMap(lggroups, useNativeMap);
+   mapType = useNativeMap ? TYPE_LOCALITY_GROUP_MAP : 
TYPE_LOCALITY_GROUP_MAP_NATIVE;
  }
 -  }
  
 -  /**
 -   * Description of the type of SimpleMap that is created.
 -   * 
 -   * If no locality groups are present, the SimpleMap is either 
TYPE_DEFAULT_MAP or TYPE_NATIVE_MAP_WRAPPER. If there is one more locality 
groups, then the
 -   * InMemoryMap has an array for simple maps that either contain either 
TYPE_LOCALITY_GROUP_MAP which contains DefaultMaps or 
TYPE_LOCALITY_GROUP_MAP_NATIVE
 -   * which contains NativeMapWrappers.
 -   *
 -   * @return String that describes the Map type
 -   */
 -  public String getMapType() {
 -return mapType;
 -  }
 -
 -  public InMemoryMap(AccumuloConfiguration config) throws 
LocalityGroupConfigurationError {
 -this(LocalityGrou

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

Branch: refs/heads/master
Commit: 1d490300ac6ce3841d81038823a0433301aa1b58
Parents: edfa895 7d06316
Author: Christopher Tubbs 
Authored: Thu Mar 24 18:38:02 2016 -0400
Committer: Christopher Tubbs 
Committed: Thu Mar 24 18:38:02 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1d490300/assemble/bin/start-all.sh
--

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

[ctubbsii]

Merge branch '1.7'

Conflicts:
pom.xml


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

Branch: refs/heads/master
Commit: db21315983114f13b33c15f284c1fdfbc0799928
Parents: 0e652f1 e52d547
Author: Christopher Tubbs 
Authored: Thu Mar 3 18:25:10 2016 -0500
Committer: Christopher Tubbs 
Committed: Thu Mar 3 18:25:10 2016 -0500

--
 pom.xml | 26 ++
 1 file changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/db213159/pom.xml
--
diff --cc pom.xml
index f525287,90f6311..e4c3ea6
--- a/pom.xml
+++ b/pom.xml
@@@ -1484,31 -1490,30 +1484,57 @@@

  
  
 +  performanceTests
 +  
 +
 +  
 +
 +
 +  org.apache.maven.plugins
 +  maven-failsafe-plugin
 +  
 +
 +  
 +  run-performance-tests
 +  
 +integration-test
 +verify
 +  
 +  
 +${accumulo.performanceTests}
 +  
 +
 +  
 +
 +  
 +
 +  
 +
++
+   aggregate-javadocs
+   
+ 
+   
+ 
+   org.apache.maven.plugins
+   maven-javadoc-plugin
+   
+ 
+   
**/org/apache/accumulo/core/client/**/*.java
+   
**/org/apache/accumulo/core/data/**/*.java
+   
**/org/apache/accumulo/core/security/**/*.java
+   
**/org/apache/accumulo/minicluster/**/*.java
+ 
+ 
+   **/crypto/**/*.java
+   **/impl/**/*.java
+   **/thrift/**/*.java
+ 
+   
+ 
+   
+ 
+   
+ 

  

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

Branch: refs/heads/master
Commit: 3c023a3c8972c9da00e451f79d01595af5b8edc5
Parents: a6e6e67 c283f4a
Author: Christopher Tubbs 
Authored: Fri Feb 12 17:45:49 2016 -0500
Committer: Christopher Tubbs 
Committed: Fri Feb 12 17:45:49 2016 -0500

--

--

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

[ctubbsii]

Merge branch '1.7'

Conflicts:
test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java


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

Branch: refs/heads/master
Commit: 8949fd460ff54ce6b5a70701da3a860ac7c0221c
Parents: de50416 a2b15bf
Author: Christopher Tubbs 
Authored: Wed Feb 10 13:05:13 2016 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 10 13:05:13 2016 -0500

--
 test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8949fd46/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
index 7984393,000..9a72051
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
@@@ -1,171 -1,0 +1,173 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.test;
 +
 +import static org.junit.Assert.assertTrue;
 +
 +import java.io.File;
 +import java.io.FileOutputStream;
 +import java.io.IOException;
 +import java.io.OutputStream;
 +import java.util.Collection;
 +import java.util.Map.Entry;
 +import java.util.Set;
 +import java.util.concurrent.TimeUnit;
 +
 +import org.apache.accumulo.core.client.BatchWriter;
 +import org.apache.accumulo.core.client.BatchWriterConfig;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.security.tokens.PasswordToken;
++import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Mutation;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.RootTable;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.minicluster.ServerType;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 +import org.apache.accumulo.minicluster.impl.ProcessReference;
 +import org.apache.accumulo.test.functional.ConfigurableMacBase;
 +import org.apache.commons.io.FileUtils;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.fs.RawLocalFileSystem;
 +import org.junit.Assert;
 +import org.junit.Test;
 +
 +import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 +
 +public class ExistingMacIT extends ConfigurableMacBase {
 +  @Override
 +  public int defaultTimeoutSeconds() {
 +return 2 * 60;
 +  }
 +
 +  @Override
 +  public void configure(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
 +cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "15s");
 +
 +// use raw local file system so walogs sync and flush will work
 +hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
 +  }
 +
 +  private void createEmptyConfig(File confFile) throws IOException {
 +Configuration conf = new Configuration(false);
 +OutputStream hcOut = new FileOutputStream(confFile);
 +conf.writeXml(hcOut);
 +hcOut.close();
 +  }
 +
 +  @Test
 +  public void testExistingInstance() throws Exception {
 +
 +Connector conn = getCluster().getConnector("root", new 
PasswordToken(ROOT_PASSWORD));
 +
 +conn.tableOperations().create("table1");
 +
 +BatchWriter bw = conn.createBatchWriter("table1", new 
BatchWriterConfig());
 +
 +Mutation m1 = new Mutation("00081");
 +m1.put("math", "sqroot", "9");
 +m1.put("math", "sq", "6560");
 +
 +bw.a

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

[ctubbsii]

Merge branch '1.7'

Conflicts:
maven-plugin/src/it/plugin-test/pom.xml


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

Branch: refs/heads/master
Commit: 03246da498401033669d6405f42cc6c87d71173c
Parents: 78cbeab 81f1c7d
Author: Christopher Tubbs 
Authored: Wed Feb 3 16:56:14 2016 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 3 16:56:14 2016 -0500

--
 maven-plugin/src/it/plugin-test/pom.xml | 11 +++
 pom.xml |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/03246da4/maven-plugin/src/it/plugin-test/pom.xml
--
diff --cc maven-plugin/src/it/plugin-test/pom.xml
index 19f59b9,2eb8626..f114fa4
--- a/maven-plugin/src/it/plugin-test/pom.xml
+++ b/maven-plugin/src/it/plugin-test/pom.xml
@@@ -118,21 -114,12 +114,28 @@@
  


 +org.apache.maven.plugins
 +maven-failsafe-plugin
 +
 +  
 +run-integration-tests
 +
 +  integration-test
 +  verify
 +
 +
 +  
 +
 +  
 +
 +  
++  
+ org.apache.rat
+ apache-rat-plugin
+ 
+   true
+ 
+   
  

  

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

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

Branch: refs/heads/master
Commit: 78cbeab86480260e828f3a6905ec9810782515aa
Parents: dc087b1 301d91b
Author: Christopher Tubbs 
Authored: Wed Feb 3 14:07:45 2016 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 3 14:07:45 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/78cbeab8/pom.xml
--
diff --cc pom.xml
index 3f47c5c,7138c2f..dcc49d1
--- a/pom.xml
+++ b/pom.xml
@@@ -142,12 -137,13 +142,12 @@@
  1.7
  1.7
  
- 3.0.4
+ 3.0.5
  
  
true
 -1.5
 +1.6.2
  
  false
 -false
  
  1.7.5
  
source-release-tar

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

[elserj]

Merge branch '1.7'

Conflicts:
core/.gitignore
minicluster/.gitignore
start/.gitignore

Closes apache/accumulo#66


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

Branch: refs/heads/master
Commit: 7a6b48203349f3ba8ca97ba08c8d93935649f562
Parents: 4eadac1 5596b01
Author: Josh Elser 
Authored: Fri Jan 29 12:15:15 2016 -0500
Committer: Josh Elser 
Committed: Fri Jan 29 12:39:36 2016 -0500

--
 .gitignore |  3 +++
 assemble/.gitignore|  3 +++
 assemble/pom.xml   |  3 +++
 core/.gitignore|  3 +++
 core/pom.xml   |  3 +++
 docs/.gitignore|  3 +++
 examples/simple/.gitignore |  3 +++
 examples/simple/pom.xml|  3 +++
 fate/.gitignore|  3 +++
 maven-plugin/.gitignore|  3 +++
 minicluster/.gitignore |  3 +++
 pom.xml| 12 
 proxy/.gitignore   |  3 +++
 server/base/.gitignore |  3 +++
 server/gc/.gitignore   |  3 +++
 server/master/.gitignore   |  3 +++
 server/monitor/.gitignore  |  3 +++
 server/monitor/pom.xml |  3 +++
 server/native/.gitignore   |  3 +++
 server/tracer/.gitignore   |  3 +++
 server/tserver/.gitignore  |  3 +++
 server/tserver/pom.xml |  3 +++
 shell/.gitignore   |  4 +++-
 shell/pom.xml  | 17 +
 start/.gitignore   |  4 +++-
 test/.gitignore|  4 
 test/pom.xml   |  3 +++
 trace/.gitignore   |  3 +++
 28 files changed, 108 insertions(+), 2 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6b4820/examples/simple/pom.xml
--

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

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6b4820/server/tserver/pom.xml
--

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6b4820/start/.gitignore
--
diff --cc start/.gitignore
index e7d7fb1,f97b5ca..e77a822
--- a/start/.gitignore
+++ b/start/.gitignore
@@@ -23,4 -23,7 +23,6 @@@
  /.pydevproject
  /.idea
  /*.iml
- /target/
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
 -

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

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

Branch: refs/heads/master
Commit: 97ce2a7584876d617ecb2171c162b1482336bf62
Parents: 664012d 0faf8b9
Author: Christopher Tubbs 
Authored: Wed Jan 27 18:01:49 2016 -0500
Committer: Christopher Tubbs 
Committed: Wed Jan 27 18:01:49 2016 -0500

--

--

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

Branch: refs/heads/master
Commit: bd515fceb461854c78521beb9dad7121bbe75c08
Parents: 081eb1f a4a1d6e
Author: Josh Elser 
Authored: Wed Jan 13 15:11:10 2016 -0500
Committer: Josh Elser 
Committed: Wed Jan 13 15:11:10 2016 -0500

--
 .../java/org/apache/accumulo/tserver/session/ScanSession.java  | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd515fce/server/tserver/src/main/java/org/apache/accumulo/tserver/session/ScanSession.java
--

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

Branch: refs/heads/master
Commit: 18725dd6c17cccd1060737e81956b6ee0d824c4a
Parents: 21123cc 6562828
Author: Josh Elser 
Authored: Tue Jan 12 00:24:37 2016 -0500
Committer: Josh Elser 
Committed: Tue Jan 12 00:24:37 2016 -0500

--
 .../org/apache/accumulo/core/conf/Property.java |   6 +-
 .../tserver/session/ConditionalSession.java |   3 +-
 .../tserver/session/MultiScanSession.java   |   4 +-
 .../accumulo/tserver/session/ScanSession.java   |   6 +-
 .../accumulo/tserver/session/Session.java   |   4 +-
 .../tserver/session/SessionManager.java |  61 ++-
 .../apache/accumulo/tserver/tablet/Scanner.java |  68 +--
 .../test/functional/ScanSessionTimeOutIT.java   |  15 +-
 .../test/functional/SessionBlockVerifyIT.java   | 176 +++
 9 files changed, 306 insertions(+), 37 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/18725dd6/server/tserver/src/main/java/org/apache/accumulo/tserver/session/ConditionalSession.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/18725dd6/server/tserver/src/main/java/org/apache/accumulo/tserver/session/MultiScanSession.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/18725dd6/server/tserver/src/main/java/org/apache/accumulo/tserver/session/ScanSession.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/18725dd6/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/18725dd6/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Scanner.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/18725dd6/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
index 78262ef,000..0074eac
mode 100644,00..100644
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
@@@ -1,144 -1,0 +1,153 @@@
 +/*
 + * 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 java.util.Iterator;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.concurrent.TimeUnit;
 +
 +import org.apache.accumulo.core.client.BatchWriter;
 +import org.apache.accumulo.core.client.BatchWriterConfig;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.admin.InstanceOperations;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Mutation;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.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.io.Text;
 +im

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

[ctubbsii]

Merge branch '1.7'

Conflicts:
pom.xml


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

Branch: refs/heads/master
Commit: 21123cca72a576c237e17b2a95b0105202265d45
Parents: 6471355 642add8
Author: Christopher Tubbs 
Authored: Mon Jan 11 19:59:51 2016 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 11 19:59:51 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/21123cca/pom.xml
--
diff --cc pom.xml
index 3f90af2,3fc5d96..e7bb0f6
--- a/pom.xml
+++ b/pom.xml
@@@ -689,8 -654,8 +689,8 @@@
  true
  clean deploy
  clean verify
- @{project.version}
+ rel/@{project.version}
 -
apache-release,move-source-tarball,seal-jars,skip-findbugs,skip-plugin-its-with-skipTests
 +
apache-release,accumulo-release,skip-plugin-its-with-skipTests
  false
  false
  true

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

Branch: refs/heads/master
Commit: e7fe96f2aa63e44e0c8604de504976e5cdc6dc7d
Parents: 7c4ef06 78659a6
Author: Josh Elser 
Authored: Sun Jan 10 13:20:20 2016 -0500
Committer: Josh Elser 
Committed: Sun Jan 10 13:20:20 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7fe96f2/assemble/build.sh
--

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

Branch: refs/heads/master
Commit: 7c4ef06f4b51f8c458407abd3771bd87aca3a36a
Parents: 8ff2ca8 d55fef7
Author: Christopher Tubbs 
Authored: Sat Jan 9 02:18:26 2016 -0500
Committer: Christopher Tubbs 
Committed: Sat Jan 9 02:18:26 2016 -0500

--
 pom.xml | 361 +++
 1 file changed, 188 insertions(+), 173 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7c4ef06f/pom.xml
--
diff --cc pom.xml
index 4149d7a,0fa003a..3f90af2
--- a/pom.xml
+++ b/pom.xml
@@@ -1286,14 -1081,222 +1113,202 @@@


  
+   m2e
+   
+ 
+   m2e.version
+ 
+   
+   
+ 
+   
+ 
+ 
+   org.eclipse.m2e
+   lifecycle-mapping
+   1.0.0
+   
+ 
+   
+ 
+   
+ org.apache.maven.plugins
+ maven-plugin-plugin
+ [3.2,)
+ 
+   helpmojo
+   descriptor
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ 
com.googlecode.maven-java-formatter-plugin
+ maven-java-formatter-plugin
+ [0.4,)
+ 
+   format
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ [2.13,)
+ 
+   check
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ [2.0,)
+ 
+   copy-dependencies
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.apache.maven.plugins
+ maven-remote-resources-plugin
+ [1.0,)
+ 
+   process
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.apache.rat
+ apache-rat-plugin
+ [0.8,)
+ 
+   check
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.codehaus.mojo
+ native-maven-plugin
+ [1.0-alpha-7,)
+ 
+   compile
+   initialize
+   javah
+   link
+   unzipinc
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.codehaus.mojo
+ exec-maven-plugin
+ [1.0,)
+ 
+   exec
+ 
+   
+   
+ 
+   
+ 
+ 
+   
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ [1.0,)
+ 
+   enforce
+ 
+  

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

Branch: refs/heads/master
Commit: c252d1a6e17ce5a0641a96c817aca029ded6ffca
Parents: 7bbf7ad d505843
Author: Christopher Tubbs 
Authored: Wed Jan 6 15:41:26 2016 -0500
Committer: Christopher Tubbs 
Committed: Wed Jan 6 15:41:26 2016 -0500

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

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

Branch: refs/heads/master
Commit: 9290ed3c5a88bb16a92980596c36ec27d1c3f619
Parents: 485c923 acf68ad
Author: Josh Elser 
Authored: Wed Dec 30 21:15:34 2015 -0500
Committer: Josh Elser 
Committed: Wed Dec 30 21:15:34 2015 -0500

--
 .../accumulo/core/client/admin/TableOperations.java | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9290ed3c/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
--

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

Branch: refs/heads/master
Commit: 485c9235091054c063384f1ecd82c6d63fba3a3e
Parents: a491dd1 3cb1e7c
Author: Josh Elser 
Authored: Wed Dec 30 20:56:33 2015 -0500
Committer: Josh Elser 
Committed: Wed Dec 30 20:56:33 2015 -0500

--

--

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

Branch: refs/heads/master
Commit: e721c3915eb5d80f0d2bda2766c2b9edd6ce5734
Parents: 9d91738 76d9ed7
Author: Josh Elser 
Authored: Wed Dec 30 19:53:07 2015 -0500
Committer: Josh Elser 
Committed: Wed Dec 30 19:53:07 2015 -0500

--

--

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

Branch: refs/heads/master
Commit: 7f4cb62b01595fa3477f7d0917d64ba91ed1ba17
Parents: 7b1e26a 14e88e4
Author: Josh Elser 
Authored: Mon Dec 28 13:37:25 2015 -0500
Committer: Josh Elser 
Committed: Mon Dec 28 13:37:50 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f4cb62b/docs/src/main/asciidoc/chapters/administration.txt
--
diff --cc docs/src/main/asciidoc/chapters/administration.txt
index 01c5c5c,919ec8f..26ec395
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@@ -472,6 -429,46 +472,47 @@@ from the +$ACCUMULO_HOME/conf/slaves+ f
  ensure that the tabletserver is cleanly stopped and recovery will not need to 
be performed
  when the tablets are re-hosted.
  
+  Running multiple TabletServers on a single node
+ 
+ With very powerful nodes, it may be beneficial to run more than one 
TabletServer on a given
+ node. This decision should be made carefully and with much deliberation as 
Accumulo is designed
+ to be able to scale to using 10's of GB of RAM and 10's of CPU cores.
+ 
+ To run multiple TabletServers on a single host, it is necessary to create 
multiple Accumulo configuration
+ directories. Ensuring that these properties are appropriately set (and remain 
consistent) are an exercise
+ for the user.
+ 
+ Accumulo TabletServers bind certain ports on the host to accommodate remote 
procedure calls to/from
+ other nodes. This requires additional configuration values in 
+accumulo-site.xml+:
+ 
+ * +tserver.port.client+
+ * +replication.receipt.service.port+
+ 
+ Normally, setting a value of +0+ for these configuration properties is 
sufficient. In some
+ environment, the ports used by Accumulo must be well-known for security 
reasons and require a
+ separate copy of the configuration files to use a static port for each 
TabletServer instance.
+ 
+ It is also necessary to update the following exported variables in 
+accumulo-env.sh+.
+ 
+ * +ACCUMULO_LOG_DIR+
++* +ACCUMULO_PID_DIR+
+ 
+ The values for these properties are left up to the user to define; there are 
no constraints
+ other than ensuring that the directory exists and the user running Accumulo 
has the permission
+ to read/write into that directory.
+ 
+ Accumulo's provided scripts for stopping a cluster operate under the 
assumption that one process
+ is running per host. As such, starting and stopping multiple TabletServers on 
one host requires
+ more effort on the user. It is important to ensure that +ACCUMULO_CONF_DIR+ 
is correctly
+ set for the instance of the TabletServer being started.
+ 
+   $ACCUMULO_CONF_DIR=$ACCUMULO_HOME/conf $ACCUMULO_HOME/bin/accumulo tserver 
--address  &
+ 
+ To stop TabletServers, the normal +stop-all.sh+ will stop all instances of 
TabletServers across all nodes.
+ Using the provided +kill+ command by your operation system is an option to 
stop a single instance on
+ a single node. +stop-server.sh+ can be used to stop all TabletServers on a 
single node.
+ 
+ 
  [[monitoring]]
  === Monitoring
  

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

Branch: refs/heads/master
Commit: fbbc0c54bd12ad4ab0c8b4b8228451ca597da3b9
Parents: 1bcddcf 904e957
Author: Josh Elser 
Authored: Wed Dec 9 11:51:17 2015 -0500
Committer: Josh Elser 
Committed: Wed Dec 9 11:51:17 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fbbc0c54/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--

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

Branch: refs/heads/master
Commit: a3b862d82fff3c094e13d0302942e15cd2c55bb2
Parents: afd31ed f85717c
Author: Josh Elser 
Authored: Fri Dec 4 16:24:17 2015 -0500
Committer: Josh Elser 
Committed: Fri Dec 4 16:24:17 2015 -0500

--
 .../accumulo/core/rpc/TTimeoutTransport.java| 21 ++--
 1 file changed, 19 insertions(+), 2 deletions(-)
--

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

Branch: refs/heads/master
Commit: f02a65cd2cd9715d1dc9e212fd97829ce3d8be40
Parents: 6e5fa1c c20996d
Author: Josh Elser 
Authored: Thu Dec 3 16:49:06 2015 -0500
Committer: Josh Elser 
Committed: Thu Dec 3 16:49:06 2015 -0500

--

--

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

Branch: refs/heads/master
Commit: 46e5d5c8d14c6fcacad5c15c71f5921d8333bd85
Parents: 7dc3736 0e3af1e
Author: Christopher Tubbs 
Authored: Thu Dec 3 16:06:51 2015 -0500
Committer: Christopher Tubbs 
Committed: Thu Dec 3 16:06:51 2015 -0500

--
 .../src/main/java/org/apache/accumulo/proxy/Proxy.java  |  2 +-
 .../java/org/apache/accumulo/server/rpc/RpcWrapper.java | 12 ++--
 .../org/apache/accumulo/server/rpc/RpcWrapperTest.java  |  9 +++--
 .../org/apache/accumulo/gc/SimpleGarbageCollector.java  |  2 +-
 .../main/java/org/apache/accumulo/master/Master.java|  4 ++--
 .../java/org/apache/accumulo/tserver/TabletServer.java  |  4 ++--
 6 files changed, 15 insertions(+), 18 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/46e5d5c8/server/master/src/main/java/org/apache/accumulo/master/Master.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/46e5d5c8/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 1af114c,1080d8d..cc4ee73
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -2292,8 -2331,8 +2292,8 @@@ public class TabletServer extends Accum
  
private HostAndPort startTabletClientService() throws UnknownHostException {
  // start listening for client connection last
 -ThriftClientHandler handler = new ThriftClientHandler();
 -Iface rpcProxy = RpcWrapper.service(handler, new 
Processor(handler));
 +clientHandler = new ThriftClientHandler();
- Iface rpcProxy = RpcWrapper.service(clientHandler, new 
Processor(clientHandler).getProcessMapView());
++Iface rpcProxy = RpcWrapper.service(clientHandler, new 
Processor(clientHandler));
  final Processor processor;
  if (ThriftServerType.SASL == getThriftServerType()) {
Iface tcredProxy = TCredentialsUpdatingWrapper.service(rpcProxy, 
ThriftClientHandler.class, getConfiguration());

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

Branch: refs/heads/master
Commit: 2b6e68b6a6966c4dc80b422aa9e7a1766936b7da
Parents: 0e1da5a 1853d08
Author: Josh Elser 
Authored: Sat Nov 21 17:29:57 2015 -0500
Committer: Josh Elser 
Committed: Sat Nov 21 17:29:57 2015 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b6e68b6/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--

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

Branch: refs/heads/master
Commit: 5a3082d6e64f4aafd2aec8f701a3c609c648d530
Parents: 469984c 3ae4336
Author: Josh Elser 
Authored: Wed Oct 28 11:16:03 2015 -0400
Committer: Josh Elser 
Committed: Wed Oct 28 11:16:03 2015 -0400

--

--

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

Branch: refs/heads/master
Commit: 469984c4918f82c4c407904f0dd97b35a34c14c1
Parents: dfbb3c2 dfa734f
Author: Josh Elser 
Authored: Mon Oct 26 00:14:04 2015 -0400
Committer: Josh Elser 
Committed: Mon Oct 26 00:14:04 2015 -0400

--
 .../src/main/java/org/apache/accumulo/monitor/Monitor.java| 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/469984c4/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
--

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

[elserj]

Merge branch '1.7'

Conflicts:
test/src/main/java/org/apache/accumulo/test/NamespacesIT.java


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

Branch: refs/heads/master
Commit: a81b966a792b2d69f9a0ff129faf1e84f4eb81fb
Parents: 43f4464 a4bc71b
Author: Josh Elser 
Authored: Wed Oct 21 13:47:56 2015 -0400
Committer: Josh Elser 
Committed: Wed Oct 21 13:47:56 2015 -0400

--
 .../org/apache/accumulo/test/NamespacesIT.java  | 99 +++-
 1 file changed, 77 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a81b966a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
index b407ead,000..cdb3d00
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
@@@ -1,1364 -1,0 +1,1419 @@@
 +/*
 + * 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 java.nio.charset.StandardCharsets.UTF_8;
 +import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
 +import static org.junit.Assert.assertNotNull;
 +import static org.junit.Assert.assertNull;
 +import static org.junit.Assert.assertTrue;
 +import static org.junit.Assert.fail;
 +
 +import java.io.IOException;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.EnumSet;
 +import java.util.Iterator;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Set;
 +import java.util.SortedSet;
 +import java.util.TreeSet;
 +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.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.MutationsRejectedException;
 +import org.apache.accumulo.core.client.NamespaceExistsException;
 +import org.apache.accumulo.core.client.NamespaceNotEmptyException;
 +import org.apache.accumulo.core.client.NamespaceNotFoundException;
 +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.NamespaceOperations;
 +import org.apache.accumulo.core.client.admin.NewTableConfiguration;
 +import org.apache.accumulo.core.client.admin.TableOperations;
 +import org.apache.accumulo.core.client.impl.Namespaces;
 +import org.apache.accumulo.core.client.impl.Tables;
 +import org.apache.accumulo.core.client.impl.thrift.TableOperation;
 +import 
org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
 +import 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
 +import org.apache.accumulo.core.client.security.SecurityErrorCode;
 +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.iterators.Filter;
 +import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 +import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 +import org.apache.accumulo.core.iterators.user.VersioningIterator;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import or

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

Branch: refs/heads/master
Commit: 647cfb74f25c8174c8526d8e83fd3fd6c6dac64c
Parents: 5a2396e 8532f07
Author: Josh Elser 
Authored: Sat Oct 3 18:17:59 2015 -0400
Committer: Josh Elser 
Committed: Sat Oct 3 18:17:59 2015 -0400

--
 .../org/apache/accumulo/core/file/blockfile/cache/BlockCache.java  | 2 --
 .../org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java | 2 --
 .../accumulo/core/file/blockfile/cache/CachedBlockQueue.java   | 2 --
 .../org/apache/accumulo/core/file/blockfile/cache/ClassSize.java   | 2 --
 .../org/apache/accumulo/core/file/blockfile/cache/HeapSize.java| 2 --
 .../apache/accumulo/core/file/blockfile/cache/LruBlockCache.java   | 2 --
 .../accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java   | 2 --
 .../accumulo/core/file/blockfile/cache/TestLruBlockCache.java  | 2 --
 8 files changed, 16 deletions(-)
--

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

Branch: refs/heads/master
Commit: 5a2396eef8cd6faac1ca6dd61f5fe574b1963285
Parents: 5da68b7 7b5ad53
Author: Josh Elser 
Authored: Sat Oct 3 18:10:00 2015 -0400
Committer: Josh Elser 
Committed: Sat Oct 3 18:10:00 2015 -0400

--
 assemble/bin-LICENSE | 76 ---
 1 file changed, 76 deletions(-)
--

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

Branch: refs/heads/master
Commit: 18e834ec251fefa308a695f1bc2414c473e2e166
Parents: 47cf834 38f36e2
Author: Christopher Tubbs 
Authored: Thu Oct 1 12:47:31 2015 -0400
Committer: Christopher Tubbs 
Committed: Thu Oct 1 12:47:31 2015 -0400

--

--

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

Branch: refs/heads/master
Commit: 3b4e57aca4dd8423aca4b9bfa9e64262935d105d
Parents: ca05baa 7c94ea0
Author: Josh Elser 
Authored: Sat Sep 12 18:48:05 2015 -0400
Committer: Josh Elser 
Committed: Sat Sep 12 18:48:05 2015 -0400

--
 assemble/pom.xml| 14 
 .../src/main/appended-resources/META-INF/NOTICE |  9 +++
 .../main/appended-resources/META-INF/LICENSE| 74 
 .../main/appended-resources/META-INF/LICENSE| 74 
 .../src/main/appended-resources/META-INF/NOTICE |  9 ---
 5 files changed, 97 insertions(+), 83 deletions(-)
--


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

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

Branch: refs/heads/master
Commit: 7e45a37d7c2ed78494d068ad42c13e55254a6c50
Parents: 7059d73 5ccb54e
Author: Josh Elser 
Authored: Mon Aug 24 13:03:19 2015 -0400
Committer: Josh Elser 
Committed: Mon Aug 24 13:03:19 2015 -0400

--
 .../src/main/java/org/apache/accumulo/monitor/Monitor.java  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7e45a37d/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
--

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

Branch: refs/heads/master
Commit: 7059d734b36df229942ebbeac01c635a2a004ba3
Parents: f7a543a af5a37d
Author: Josh Elser 
Authored: Mon Aug 24 01:07:03 2015 -0400
Committer: Josh Elser 
Committed: Mon Aug 24 01:22:13 2015 -0400

--
 .../test/BulkImportSequentialRowsIT.java| 112 +++
 1 file changed, 112 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7059d734/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
index 000,000..037ec7e
new file mode 100644
--- /dev/null
+++ 
b/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java
@@@ -1,0 -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.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);
++
++  @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 = new TreeSet();
++for (int i = 0; i < 100; i++) {
++  String row = String.format("%03d", i);
++  splits.add(new Text(row));
++  writer.append(new Key(row, "", ""), emptyValue);
++  for (int j = 0; j < 100; j++) {
++writer.append(new Key(row, "", String

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

Branch: refs/heads/master
Commit: b921411dc71e1e5c5e7e86bb11e78e586b9df98b
Parents: 4dee3c1 da484a8
Author: Josh Elser 
Authored: Fri Aug 21 23:51:39 2015 -0400
Committer: Josh Elser 
Committed: Fri Aug 21 23:51:39 2015 -0400

--
 .../accumulo/shell/commands/ActiveScanIterator.java   | 10 +-
 .../main/java/org/apache/accumulo/test/ShellServerIT.java |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b921411d/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
index 249d88f,000..fe169a0
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
@@@ -1,1720 -1,0 +1,1722 @@@
 +/*
 + * 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 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 +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.BufferedReader;
 +import java.io.File;
 +import java.io.FileReader;
 +import java.io.IOException;
 +import java.io.InputStream;
 +import java.io.OutputStream;
 +import java.io.PrintWriter;
 +import java.lang.reflect.Constructor;
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Random;
 +import java.util.concurrent.TimeUnit;
 +
 +import jline.console.ConsoleReader;
 +
 +import org.apache.accumulo.core.Constants;
 +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.IteratorSetting;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.admin.TableOperations;
 +import org.apache.accumulo.core.client.impl.Namespaces;
 +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.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +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.metadata.MetadataTable;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.core.util.format.Formatter;
 +import org.apache.accumulo.harness.SharedMiniClusterBase;
 +import org.apache.accumulo.shell.Shell;
 +import org.apache.accumulo.test.functional.SlowIterator;
 +import org.apache.accumulo.tracer.TraceServer;
 +import org.apache.commons.configuration.ConfigurationException;
 +import org.apache.commons.io.FileUtils;
 +import org.apache.commons.lang.StringUtils;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.fs.FileSystem;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.hadoop.io.Text;
 +import org.apache.hadoop.tools.DistCp;
 +import org.junit.After;
 +import org.junit.AfterClass;
 +import org.junit.Assert;
 +import org.jun

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

Branch: refs/heads/master
Commit: 4dee3c174c38169729c3204e7c1fcccd9b15464f
Parents: 7c146e0 071c32f
Author: Josh Elser 
Authored: Thu Aug 20 18:40:09 2015 -0400
Committer: Josh Elser 
Committed: Thu Aug 20 18:40:09 2015 -0400

--
 .../server/security/AuditedSecurityOperation.java |  2 +-
 .../java/org/apache/accumulo/test/AuditMessageIT.java | 14 ++
 2 files changed, 11 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4dee3c17/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java
index 1eb2373,000..ac97f00
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java
@@@ -1,506 -1,0 +1,512 @@@
 +/*
 + * 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 java.nio.charset.StandardCharsets.UTF_8;
 +import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertNotNull;
 +import static org.junit.Assert.assertTrue;
 +
 +import java.io.File;
 +import java.io.IOException;
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.Map;
 +import java.util.Set;
 +
 +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.TableOperations;
 +import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Mutation;
 +import org.apache.accumulo.core.data.Range;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.core.security.SystemPermission;
 +import org.apache.accumulo.core.security.TablePermission;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 +import org.apache.accumulo.server.security.AuditedSecurityOperation;
 +import org.apache.accumulo.test.functional.ConfigurableMacBase;
 +import org.apache.commons.io.FileUtils;
 +import org.apache.commons.io.LineIterator;
 +import org.apache.hadoop.io.Text;
 +import org.junit.After;
 +import org.junit.Before;
 +import org.junit.Test;
 +
 +/**
 + * Tests that Accumulo is outputting audit messages as expected. Since this 
is using MiniAccumuloCluster, it could take a while if we test everything in
 + * isolation. We test blocks of related operations, run the whole test in one 
MiniAccumulo instance, trying to clean up objects between each test. The
 + * MiniAccumuloClusterTest sets up the log4j stuff differently to an 
installed instance, instead piping everything through stdout and writing to a 
set location
 + * so we have to find the logs and grep the bits we need out.
 + */
 +public class AuditMessageIT extends ConfigurableMacBase {
 +
 +  private static final String AUDIT_USER_1 = "AuditUser1";
 +  private static final String AUDIT_USER_2 = "AuditUser2";
 +  private static final String PASSWORD = "password";
 +  private static final String OLD_TEST_TABLE_NAME = "apples";
 +  private static fi

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

Branch: refs/heads/master
Commit: b16c6453a96ace0db64870fe3f1a8cf59ca40ef2
Parents: b8e19a4 5f76160
Author: Josh Elser 
Authored: Wed Aug 5 12:37:28 2015 -0400
Committer: Josh Elser 
Committed: Wed Aug 5 12:37:28 2015 -0400

--

--

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

Branch: refs/heads/master
Commit: 1dd6b704ab415dc6c02c69a72803645eb7d5c404
Parents: 978e621 acef2e5
Author: Josh Elser 
Authored: Thu Jul 2 18:17:08 2015 -0400
Committer: Josh Elser 
Committed: Thu Jul 2 18:17:08 2015 -0400

--
 .../java/org/apache/accumulo/shell/mock/MockShell.java   | 11 +++
 1 file changed, 11 insertions(+)
--

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

Branch: refs/heads/master
Commit: 6697ed5bd4dc3815d60ec236859b6f8a3e22daec
Parents: a3af982 3d63bf7
Author: Josh Elser 
Authored: Wed Jun 24 14:02:14 2015 -0400
Committer: Josh Elser 
Committed: Wed Jun 24 14:02:14 2015 -0400

--

--

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

Branch: refs/heads/master
Commit: a3af98261a8b3d99deaab9ec37aee53587676ec2
Parents: 245d724 d0c1e9f
Author: Josh Elser 
Authored: Wed Jun 24 12:40:02 2015 -0400
Committer: Josh Elser 
Committed: Wed Jun 24 12:40:02 2015 -0400

--

--

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

Branch: refs/heads/master
Commit: 29fdbfbb74199d96e5f84a70de3ad7c2c51f6035
Parents: b8005be f1bc1dd
Author: Josh Elser 
Authored: Tue Jun 23 22:50:34 2015 -0400
Committer: Josh Elser 
Committed: Tue Jun 23 22:50:34 2015 -0400

--
 test/system/continuous/run-verify.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

Branch: refs/heads/master
Commit: 686ee12ff4ecd16ea5181f1e21d14bd77255cf0e
Parents: 9026ff8 61bb1b4
Author: Christopher Tubbs 
Authored: Wed Jun 17 18:16:21 2015 -0400
Committer: Christopher Tubbs 
Committed: Wed Jun 17 18:16:21 2015 -0400

--
 CHANGES| 1776 ---
 assemble/src/main/assemblies/component.xml |1 -
 2 files changed, 1777 deletions(-)
--

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

[ctubbsii]

Merge branch '1.7'

Conflicts:
pom.xml


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

Branch: refs/heads/master
Commit: f6df8991b078df1d1a58fa31995f1205941d5af2
Parents: 93f285e 50f8a79
Author: Christopher Tubbs 
Authored: Tue Jun 9 20:19:20 2015 -0400
Committer: Christopher Tubbs 
Committed: Tue Jun 9 20:19:20 2015 -0400

--
 maven-plugin/pom.xml | 80 ++-
 pom.xml  |  2 +-
 2 files changed, 46 insertions(+), 36 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6df8991/pom.xml
--
diff --cc pom.xml
index 7f8da69,3477bff..5990d63
--- a/pom.xml
+++ b/pom.xml
@@@ -665,7 -654,7 +665,7 @@@
  clean deploy
  clean verify
  @{project.version}
- 
apache-release,accumulo-release,!test-accumulo-maven-plugin
 -
apache-release,move-source-tarball,seal-jars,skip-findbugs,skip-plugin-its-with-skipTests
++
apache-release,accumulo-release,skip-plugin-its-with-skipTests
  false
  false
  true

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

[ctubbsii]

Merge branch '1.7'

Conflicts:

server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java


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

Branch: refs/heads/master
Commit: 93f285ee4312780a0a95f0f81dd475212f640f60
Parents: f83 21059c5
Author: Christopher Tubbs 
Authored: Tue Jun 9 19:04:34 2015 -0400
Committer: Christopher Tubbs 
Committed: Tue Jun 9 19:04:34 2015 -0400

--
 .../org/apache/accumulo/master/tableOps/CreateImportDir.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--

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

Branch: refs/heads/master
Commit: f839d7b95a5f66b94a17f560ede38d27d45b
Parents: f93803f e0c72f2
Author: Christopher Tubbs 
Authored: Tue Jun 9 13:52:27 2015 -0400
Committer: Christopher Tubbs 
Committed: Tue Jun 9 13:52:27 2015 -0400

--
 .../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java| 4 
 .../accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 7 +++
 2 files changed, 11 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f839/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
--

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

Branch: refs/heads/master
Commit: 044e46df5bcd78864d063a35c69ecc0695507826
Parents: 6965c41 e04ea77
Author: Josh Elser 
Authored: Thu Jun 4 00:13:12 2015 -0400
Committer: Josh Elser 
Committed: Thu Jun 4 00:13:12 2015 -0400

--
 .../apache/accumulo/test/functional/ScanIdIT.java | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)
--

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

Branch: refs/heads/master
Commit: fba068b7b5dab69428042f8e7fae50673079d7fe
Parents: 8c05943 99c734c
Author: Josh Elser 
Authored: Mon Jun 1 18:41:33 2015 -0400
Committer: Josh Elser 
Committed: Mon Jun 1 18:41:33 2015 -0400

--
 .../java/org/apache/accumulo/tserver/TabletServer.java   | 11 ---
 1 file changed, 11 deletions(-)
--


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

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

Branch: refs/heads/master
Commit: fe64510913710c268b4a17fa61a9e70fd2943d2d
Parents: 17646af 61bfbb2
Author: Christopher Tubbs 
Authored: Fri May 29 16:17:37 2015 -0400
Committer: Christopher Tubbs 
Committed: Fri May 29 16:17:37 2015 -0400

--
 .../simple/mapreduce/bulk/VerifyIngest.java | 18 +++-
 .../accumulo/test/functional/ExamplesIT.java| 31 
 2 files changed, 30 insertions(+), 19 deletions(-)
--

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

[elserj]

Merge branch '1.7'

Conflicts:

test/src/test/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java


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

Branch: refs/heads/master
Commit: ae2255c875176e5072bc6338bc5c0092b79894cd
Parents: d1cb76a 98fbe4f
Author: Josh Elser 
Authored: Wed May 27 22:03:13 2015 -0400
Committer: Josh Elser 
Committed: Wed May 27 22:03:13 2015 -0400

--
 .../apache/accumulo/tserver/tablet/Tablet.java  |  1 +
 .../test/functional/WatchTheWatchCountIT.java   | 47 +++-
 .../accumulo/test/proxy/SimpleProxyBase.java| 58 +---
 .../accumulo/test/proxy/TestProxyClient.java|  7 +++
 4 files changed, 91 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae2255c8/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae2255c8/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 e4bb836,000..8344156
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,1920 -1,0 +1,1962 @@@
 +/*
 + * 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

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

Branch: refs/heads/master
Commit: 535e2f357bfb80af5188bb6120cee66fd610b1b3
Parents: 650f1f9 f6ba154
Author: Christopher Tubbs 
Authored: Wed May 27 16:28:54 2015 -0400
Committer: Christopher Tubbs 
Committed: Wed May 27 16:28:54 2015 -0400

--
 .../src/main/java/org/apache/accumulo/tserver/scan/ScanTask.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

Branch: refs/heads/master
Commit: ca5928e2089139cda395a82d3d201d3aab1d3231
Parents: fdd7d09 07672bd
Author: Christopher Tubbs 
Authored: Tue May 26 16:45:33 2015 -0400
Committer: Christopher Tubbs 
Committed: Tue May 26 16:45:33 2015 -0400

--
 .../accumulo/monitor/EmbeddedWebServer.java | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)
--

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

Branch: refs/heads/master
Commit: 0138249ca9d83d401c6ab4bd6906a25a48a8a98f
Parents: 56e211a 829f46d
Author: Josh Elser 
Authored: Tue May 26 15:30:07 2015 -0400
Committer: Josh Elser 
Committed: Tue May 26 15:30:07 2015 -0400

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

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

Branch: refs/heads/master
Commit: 350b491d976aafda19da46caf41e6e8ade45c6f5
Parents: e007bf8 747da5a
Author: Josh Elser 
Authored: Thu May 21 21:39:42 2015 -0400
Committer: Josh Elser 
Committed: Thu May 21 21:39:42 2015 -0400

--

--

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

Branch: refs/heads/master
Commit: 9cd82738e5a1b07c709c4407d977955eed58b91f
Parents: acf6082 25d9b28
Author: Josh Elser 
Authored: Wed May 20 22:26:29 2015 -0400
Committer: Josh Elser 
Committed: Wed May 20 22:26:29 2015 -0400

--
 .../src/main/java/org/apache/accumulo/server/init/Initialize.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9cd82738/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
--

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

Branch: refs/heads/master
Commit: 5e05527410934be25e8badbb868974e9ddff
Parents: bc4874c 98f42c7
Author: Christopher Tubbs 
Authored: Mon May 11 14:08:16 2015 -0400
Committer: Christopher Tubbs 
Committed: Mon May 11 14:08:16 2015 -0400

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

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

Branch: refs/heads/master
Commit: e4caf8aff83dd96a31162505fbe4a0677b596466
Parents: b6739a2 31dd5ca
Author: Josh Elser 
Authored: Fri May 8 12:31:54 2015 -0400
Committer: Josh Elser 
Committed: Fri May 8 12:31:54 2015 -0400

--
 .../shell/commands/GetAuthsCommand.java | 19 ++---
 .../shell/commands/GetAuthsCommandTest.java | 44 
 2 files changed, 57 insertions(+), 6 deletions(-)
--

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

Branch: refs/heads/master
Commit: ca02e85d11b332edaef72cc64789cad9b73ceaba
Parents: 5e15913 0bbc675
Author: Josh Elser 
Authored: Mon May 4 14:39:12 2015 -0400
Committer: Josh Elser 
Committed: Mon May 4 14:39:12 2015 -0400

--
 .../org/apache/accumulo/shell/commands/DUCommand.java  | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)
--

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

Branch: refs/heads/master
Commit: 5e15913d9739c2005aeb893424821583eb4dd977
Parents: 87af7f6 12366d4
Author: Josh Elser 
Authored: Mon May 4 12:56:40 2015 -0400
Committer: Josh Elser 
Committed: Mon May 4 12:56:40 2015 -0400

--
 .../client/impl/NamespaceOperationsImpl.java| 10 +++
 .../core/client/impl/TableOperationsImpl.java   | 30 +---
 2 files changed, 19 insertions(+), 21 deletions(-)
--

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

Branch: refs/heads/master
Commit: cf0bcb3fbc2446fda1ec13b6e23499efc1a14992
Parents: 0f0a519 66075c3
Author: Josh Elser 
Authored: Mon Apr 27 17:58:43 2015 -0400
Committer: Josh Elser 
Committed: Mon Apr 27 17:58:43 2015 -0400

--
 .../src/main/java/org/apache/accumulo/master/Master.java  | 7 +++
 1 file changed, 7 insertions(+)
--

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

Branch: refs/heads/master
Commit: 489c9279c6d7c5f782942e0b5c0968bf6b06e884
Parents: b63f743 d3f74f7
Author: Eric Newton 
Authored: Thu Apr 23 11:17:51 2015 -0400
Committer: Eric Newton 
Committed: Thu Apr 23 11:17:51 2015 -0400

--

--