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

[busbey]

Merge branch '1.6' into 1.7

 Conflicts:

server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
server/master/src/main/java/org/apache/accumulo/master/Master.java
server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java

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

Branch: refs/heads/1.7
Commit: 371db68cfc4a82921a0b47c886be3e88c4058cdf
Parents: ffd5028 679a1c3
Author: Sean Busbey 
Authored: Wed Aug 24 10:22:25 2016 -0500
Committer: Sean Busbey 
Committed: Wed Aug 24 10:22:25 2016 -0500

--
 .../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
 .../master/src/main/java/org/apache/accumulo/master/Master.java  | 4 ++--
 .../src/main/java/org/apache/accumulo/monitor/Monitor.java   | 4 ++--
 .../src/main/java/org/apache/accumulo/tracer/TraceServer.java| 4 ++--
 .../src/main/java/org/apache/accumulo/tserver/TabletServer.java  | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
--
diff --cc 
server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index da25d55,0191f38..98acf9a
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@@ -139,14 -133,16 +139,14 @@@ public class SimpleGarbageCollector ext
  
private GCStatus status = new GCStatus(new GcCycleStats(), new 
GcCycleStats(), new GcCycleStats(), new GcCycleStats());
  
 -  private Instance instance;
 -
public static void main(String[] args) throws UnknownHostException, 
IOException {
- SecurityUtil.serverLogin(SiteConfiguration.getInstance());
  final String app = "gc";
  Accumulo.setupLogging(app);
 -SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
++SecurityUtil.serverLogin(SiteConfiguration.getInstance());
  Instance instance = HdfsZooInstance.getInstance();
 +ServerConfigurationFactory conf = new 
ServerConfigurationFactory(instance);
  log.info("Version " + Constants.VERSION);
  log.info("Instance " + instance.getInstanceID());
 -ServerConfiguration conf = new ServerConfiguration(instance);
  final VolumeManager fs = VolumeManagerImpl.get();
  Accumulo.init(fs, conf, app);
  Opts opts = new Opts();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/master/src/main/java/org/apache/accumulo/master/Master.java
--
diff --cc server/master/src/main/java/org/apache/accumulo/master/Master.java
index 5a2a346,14bdd6b..dc26a11
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@@ -1345,14 -1156,15 +1345,14 @@@ public class Master extends AccumuloSer
  
public static void main(String[] args) throws Exception {
  try {
+   final String app = "master";
+   Accumulo.setupLogging(app);
 -  SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
 +  SecurityUtil.serverLogin(SiteConfiguration.getInstance());
  
ServerOpts opts = new ServerOpts();
-   final String app = "master";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
-   Accumulo.setupLogging(app);
 -  Instance instance = HdfsZooInstance.getInstance();
 -  ServerConfiguration conf = new ServerConfiguration(instance);
 +  ServerConfigurationFactory conf = new 
ServerConfigurationFactory(HdfsZooInstance.getInstance());
VolumeManager fs = VolumeManagerImpl.get();
Accumulo.init(fs, conf, app);
Master master = new Master(conf, fs, hostname);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
--
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index c3dd773,e5ba9e4..58cf921
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -417,18 -422,17 +417,18 @@@ public class Monitor 
}

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

[kturner]

Merge branch '1.6' into 1.7

Conflicts:

core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java


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

Branch: refs/heads/1.7
Commit: 4d26943e519f62744ba0cf1637ae32153957d53c
Parents: dffb1c5 c5ac9f3
Author: Keith Turner 
Authored: Fri Jul 8 14:39:02 2016 -0400
Committer: Keith Turner 
Committed: Fri Jul 8 14:39:02 2016 -0400

--
 .../core/file/rfile/bcfile/Compression.java | 312 +++
 .../core/file/rfile/bcfile/CompressionTest.java | 244 +++
 2 files changed, 497 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d26943e/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
index 48a9acc,3b82462..459fed5
--- 
a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
@@@ -78,11 -86,39 +86,39 @@@ public final class Compression 
public static final String COMPRESSION_NONE = "none";
  
/**
-* Compression algorithms.
+* Compression algorithms. There is a static initializer, below the values 
defined in the enumeration, that calls the initializer of all defined codecs 
within
+* the Algorithm enum. This promotes a model of the following call graph of 
initialization by the static initializer, followed by calls to getCodec() and
+* createCompressionStream/DecompressionStream. In some cases, the 
compression and decompression call methods will include a different buffer size 
for the
+* stream. Note that if the compressed buffer size requested in these calls 
is zero, we will not set the buffer size for that algorithm. Instead, we will 
use
+* the default within the codec.
+*
+* The buffer size is configured in the Codec by way of a Hadoop 
Configuration reference. One approach may be to use the same Configuration 
object, but when
+* calls are made to createCompressionStream and DecompressionStream, with 
non default buffer sizes, the configuration object must be changed. In this 
case,
+* concurrent calls to createCompressionStream and DecompressionStream 
would mutate the configuration object beneath each other, requiring 
synchronization to
+* avoid undesirable activity via co-modification. To avoid synchronization 
entirely, we will create Codecs with their own Configuration object and cache 
them
+* for re-use. A default codec will be statically created, as mentioned 
above to ensure we always have a codec available at loader initialization.
+*
+* There is a Guava cache defined within Algorithm that allows us to cache 
Codecs for re-use. Since they will have their own configuration object and thus 
do
+* not need to be mutable, there is no concern for using them concurrently; 
however, the Guava cache exists to ensure a maximal size of the cache and
+* efficient and concurrent read/write access to the cache itself.
+*
+* To provide Algorithm specific details and to describe what is in code:
+*
+* LZO will always have the default LZO codec because the buffer size is 
never overridden within it.
+*
+* GZ will use the default GZ codec for the compression stream, but can 
potentially use a different codec instance for the decompression stream if the
+* requested buffer size does not match the default GZ buffer size of 32k.
+*
+* Snappy will use the default Snappy codec with the default buffer size of 
64k for the compression stream, but will use a cached codec if the buffer size
+* differs from the default.
 */
public static enum Algorithm {
+ 
  LZO(COMPRESSION_LZO) {
-   private transient boolean checked = false;
+   /**
+* determines if we've checked the codec status. ensures we don't 
recreate the defualt codec
+*/
 -  private transient AtomicBoolean checked = new AtomicBoolean(false);
++  private final AtomicBoolean checked = new AtomicBoolean(false);
private static final String defaultClazz = 
"org.apache.hadoop.io.compress.LzoCodec";
private transient CompressionCodec codec = null;
  
@@@ -102,12 -137,34 +137,35 @@@
  return codec != null;
}
  
 +  @Override
-   CompressionCodec getCodec() throws IOException {
- if (!isSupported()) {
-   throw new IOException("LZO codec 

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

[dhutchis]

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

Branch: refs/heads/1.7
Commit: 7f12433735f9535b3f06dc2744d596192f414406
Parents: e743695 67605d7
Author: Dylan Hutchison 
Authored: Wed Jun 8 19:21:28 2016 -0700
Committer: Dylan Hutchison 
Committed: Wed Jun 8 19:21:28 2016 -0700

--
 .../org/apache/accumulo/tserver/metrics/TabletServerMBean.java | 2 +-
 .../apache/accumulo/tserver/metrics/TabletServerMBeanImpl.java | 2 +-
 .../accumulo/tserver/metrics/TabletServerMetricsUtil.java  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f124337/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMBeanImpl.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMBeanImpl.java
index 42b2a9c,000..465e50a
mode 100644,00..100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMBeanImpl.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMBeanImpl.java
@@@ -1,175 -1,0 +1,175 @@@
 +/*
 + * 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.tserver.metrics;
 +
 +import javax.management.MalformedObjectNameException;
 +import javax.management.ObjectName;
 +import javax.management.StandardMBean;
 +
 +import org.apache.accumulo.server.metrics.AbstractMetricsImpl;
 +import org.apache.accumulo.tserver.TabletServer;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +public class TabletServerMBeanImpl extends AbstractMetricsImpl implements 
TabletServerMBean {
 +  private static final Logger log = 
LoggerFactory.getLogger(TabletServerMBeanImpl.class);
 +  private static final String METRICS_PREFIX = "tserver";
 +  private ObjectName OBJECT_NAME = null;
 +
 +  private final TabletServerMetricsUtil util;
 +
 +  TabletServerMBeanImpl(TabletServer server) {
 +util = new TabletServerMetricsUtil(server);
 +try {
 +  OBJECT_NAME = new 
ObjectName("accumulo.server.metrics:service=TServerInfo,name=TabletServerMBean,instance="
 + Thread.currentThread().getName());
 +} catch (MalformedObjectNameException e) {
 +  log.error("Exception setting MBean object name", e);
 +}
 +  }
 +
 +  @Override
 +  public void register() throws Exception {
 +// Do this because interface not in same package.
 +StandardMBean mbean = new StandardMBean(this, TabletServerMBean.class, 
false);
 +register(mbean);
 +  }
 +
 +  @Override
 +  public long getEntries() {
 +if (isEnabled()) {
 +  return util.getEntries();
 +}
 +return 0;
 +  }
 +
 +  @Override
 +  public long getEntriesInMemory() {
 +if (isEnabled()) {
 +  return util.getEntriesInMemory();
 +}
 +return 0;
 +  }
 +
 +  @Override
-   public long getIngest() {
++  public double getIngest() {
 +if (isEnabled()) {
 +  return util.getIngest();
 +}
 +return 0;
 +  }
 +
 +  @Override
 +  public int getMajorCompactions() {
 +if (isEnabled()) {
 +  return util.getMajorCompactions();
 +}
 +return 0;
 +  }
 +
 +  @Override
 +  public int getMajorCompactionsQueued() {
 +if (isEnabled()) {
 +  return util.getMajorCompactionsQueued();
 +}
 +return 0;
 +  }
 +
 +  @Override
 +  public int getMinorCompactions() {
 +if (isEnabled()) {
 +  return util.getMinorCompactions();
 +}
 +return 0;
 +  }
 +
 +  @Override
 +  public int getMinorCompactionsQueued() {
 +if (isEnabled()) {
 +  return util.getMinorCompactionsQueued();
 +}
 +return 0;
 +  }
 +
 +  @Override
 +  

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

[ctubbsii]

Merge branch '1.6' into 1.7


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

Branch: refs/heads/1.7
Commit: f51e6b0c2d8e643344f91ce5d4386a60e9c82324
Parents: 904e957 4f02a65
Author: Christopher Tubbs 
Authored: Wed Dec 16 14:20:25 2015 -0500
Committer: Christopher Tubbs 
Committed: Wed Dec 16 14:20:25 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f51e6b0c/pom.xml
--
diff --cc pom.xml
index 8b0c656,8b4e129..c446c19
--- a/pom.xml
+++ b/pom.xml
@@@ -642,8 -608,7 +642,7 @@@

  ${project.reporting.outputEncoding}
  true
- docs
 -${java.ver}
 +${maven.compiler.target}
  -J-Xmx512m

  

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

[kturner]

Merge branch '1.6' into 1.7

Conflicts:

core/src/main/java/org/apache/accumulo/core/util/shell/commands/CompactCommand.java
shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java

shell/src/main/java/org/apache/accumulo/shell/commands/SetScanIterCommand.java

shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java


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

Branch: refs/heads/1.7
Commit: 6df97b8905d07f65d617ec59a2ad4a34afac81f1
Parents: 2033005 e4ffc77
Author: Keith Turner 
Authored: Thu Sep 3 17:05:41 2015 -0400
Committer: Keith Turner 
Committed: Thu Sep 3 17:05:41 2015 -0400

--
 .../java/org/apache/accumulo/shell/Shell.java |  8 
 .../accumulo/shell/commands/CompactCommand.java   |  4 
 .../accumulo/shell/commands/ScanCommand.java  | 18 +-
 .../accumulo/shell/commands/SetIterCommand.java   | 11 ---
 .../shell/commands/SetScanIterCommand.java| 15 +--
 .../shell/commands/SetShellIterCommand.java   |  7 ---
 6 files changed, 30 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6df97b89/shell/src/main/java/org/apache/accumulo/shell/Shell.java
--
diff --cc shell/src/main/java/org/apache/accumulo/shell/Shell.java
index 37856ad,000..483edb0
mode 100644,00..100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@@ -1,1267 -1,0 +1,1267 @@@
 +/*
 + * 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.shell;
 +
 +import static java.nio.charset.StandardCharsets.ISO_8859_1;
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
 +import java.io.BufferedWriter;
 +import java.io.File;
 +import java.io.FileNotFoundException;
 +import java.io.FileOutputStream;
 +import java.io.IOException;
 +import java.io.OutputStreamWriter;
 +import java.io.PrintWriter;
 +import java.net.InetAddress;
 +import java.nio.charset.Charset;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.HashMap;
 +import java.util.HashSet;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Locale;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Set;
 +import java.util.TreeMap;
 +import java.util.UUID;
 +import java.util.concurrent.TimeUnit;
 +
- import jline.console.ConsoleReader;
- import jline.console.UserInterruptException;
- import jline.console.history.FileHistory;
- 
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.AccumuloException;
 +import org.apache.accumulo.core.client.AccumuloSecurityException;
 +import org.apache.accumulo.core.client.ClientConfiguration;
 +import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.IteratorSetting;
 +import org.apache.accumulo.core.client.NamespaceNotFoundException;
 +import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.ZooKeeperInstance;
 +import org.apache.accumulo.core.client.impl.ClientContext;
 +import org.apache.accumulo.core.client.impl.Tables;
 +import org.apache.accumulo.core.client.mock.MockInstance;
 +import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 +import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.conf.SiteConfiguration;
 +import org.apache.accumulo.core.data.Key;
 

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

[kturner]

Merge branch '1.6' into 1.7


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

Branch: refs/heads/1.7
Commit: d77863e044f36107fcf84449f56c818b55a15ed4
Parents: 162acf2 a1497d1
Author: Keith Turner ke...@deenlo.com
Authored: Thu Aug 27 17:15:52 2015 -0400
Committer: Keith Turner ke...@deenlo.com
Committed: Thu Aug 27 17:15:52 2015 -0400

--
 .../apache/accumulo/tserver/FileManager.java|  8 +-
 .../shell/commands/SetShellIterCommand.java | 15 +---
 .../accumulo/test/IsolationAndDeepCopyIT.java   | 85 
 3 files changed, 93 insertions(+), 15 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d77863e0/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java
--
diff --cc 
shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java
index 10c67be,000..6b1da3b
mode 100644,00..100644
--- 
a/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java
+++ 
b/shell/src/main/java/org/apache/accumulo/shell/commands/SetShellIterCommand.java
@@@ -1,130 -1,0 +1,123 @@@
 +/*
 + * 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.shell.commands;
 +
 +import java.io.IOException;
 +import java.util.ArrayList;
 +import java.util.HashSet;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +
 +import org.apache.accumulo.core.client.AccumuloException;
 +import org.apache.accumulo.core.client.AccumuloSecurityException;
 +import org.apache.accumulo.core.client.IteratorSetting;
 +import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 +import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 +import org.apache.accumulo.shell.Shell;
 +import org.apache.accumulo.shell.ShellCommandException;
 +import org.apache.accumulo.shell.ShellCommandException.ErrorCode;
 +import org.apache.commons.cli.CommandLine;
 +import org.apache.commons.cli.Option;
 +import org.apache.commons.cli.OptionGroup;
 +import org.apache.commons.cli.Options;
 +
 +public class SetShellIterCommand extends SetIterCommand {
 +  private Option profileOpt;
 +
 +  @Override
 +  public int execute(final String fullCommand, final CommandLine cl, final 
Shell shellState) throws AccumuloException, AccumuloSecurityException,
 +  TableNotFoundException, IOException, ShellCommandException {
 +return super.execute(fullCommand, cl, shellState);
 +  }
 +
 +  @Override
 +  protected void setTableProperties(final CommandLine cl, final Shell 
shellState, final int priority, final MapString,String options, final String 
classname,
 +  final String name) throws AccumuloException, AccumuloSecurityException, 
ShellCommandException, TableNotFoundException {
 +// instead of setting table properties, just put the options in a list to 
use at scan time
 +
 +String profile = cl.getOptionValue(profileOpt.getOpt());
 +
- // instead of setting table properties, just put the options in a list to 
use at scan time
- Class? loadClass;
- try {
-   loadClass = getClass().getClassLoader().loadClass(classname);
- } catch (ClassNotFoundException e) {
-   throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, 
Unable to load  + classname);
- }
- try {
-   loadClass.asSubclass(SortedKeyValueIterator.class);
- } catch (ClassCastException ex) {
-   throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, 
xUnable to load  + classname +  as type  + 

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

[kturner]

Merge branch '1.6' into 1.7


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

Branch: refs/heads/1.7
Commit: 18650ac66d575659660efe33e8a505bf45765cfd
Parents: 55981ad 0bcbab7
Author: Keith Turner ktur...@apache.org
Authored: Fri Apr 24 19:39:32 2015 -0400
Committer: Keith Turner ktur...@apache.org
Committed: Fri Apr 24 19:39:32 2015 -0400

--
 .../system/SourceSwitchingIterator.java | 58 +++-
 1 file changed, 33 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/18650ac6/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java
--

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

[kturner]

Merge branch '1.6' into 1.7


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

Branch: refs/heads/1.7
Commit: 312b8762d03edce502cab1f0383f89a13caec6fa
Parents: d26fc14 5a42b1f
Author: Keith Turner ktur...@apache.org
Authored: Wed Apr 22 18:15:44 2015 -0400
Committer: Keith Turner ktur...@apache.org
Committed: Wed Apr 22 18:15:44 2015 -0400

--
 .../system/SourceSwitchingIterator.java | 29 +---
 1 file changed, 19 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/312b8762/core/src/main/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIterator.java
--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 8fae3f8060afff6c1ac7b5dac27365f3fa32b95c
Parents: 27f3b30 6605ad4
Author: Josh Elser els...@apache.org
Authored: Thu Apr 9 12:04:47 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Apr 9 12:04:47 2015 -0400

--
 .../main/java/org/apache/accumulo/cluster/RemoteShellOptions.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

[elserj]

Merge branch '1.6'

Conflicts:
docs/src/main/asciidoc/chapters/table_configuration.txt


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

Branch: refs/heads/master
Commit: 4fa6b4212eab356d7ad55369ed1a32e5436235dc
Parents: fbbe8c3 29c82db
Author: Josh Elser els...@apache.org
Authored: Sun Apr 5 22:16:52 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Sun Apr 5 22:16:52 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4fa6b421/docs/src/main/asciidoc/chapters/table_configuration.txt
--
diff --cc docs/src/main/asciidoc/chapters/table_configuration.txt
index 0e7dfa5,000..5c62ccf
mode 100644,00..100644
--- a/docs/src/main/asciidoc/chapters/table_configuration.txt
+++ b/docs/src/main/asciidoc/chapters/table_configuration.txt
@@@ -1,643 -1,0 +1,643 @@@
 +// 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.
 +
 +== Table Configuration
 +
 +Accumulo tables have a few options that can be configured to alter the default
 +behavior of Accumulo as well as improve performance based on the data stored.
 +These include locality groups, constraints, bloom filters, iterators, and 
block
 +cache.  For a complete list of available configuration options, see 
configuration.
 +
 +=== Locality Groups
 +Accumulo supports storing sets of column families separately on disk to allow
 +clients to efficiently scan over columns that are frequently used together 
and to avoid
 +scanning over column families that are not requested. After a locality group 
is set,
 +Scanner and BatchScanner operations will automatically take advantage of them
 +whenever the fetchColumnFamilies() method is used.
 +
 +By default, tables place all column families into the same ``default'' 
locality group.
 +Additional locality groups can be configured at any time via the shell or
 +programmatically as follows:
 +
 + Managing Locality Groups via the Shell
 +
 +  usage: setgroups group=col fam{,col fam}{ group=col fam{,col 
fam}}
 +  [-?] -t table
 +
 +  user@myinstance mytable setgroups group_one=colf1,colf2 -t mytable
 +
 +  user@myinstance mytable getgroups -t mytable
 +
 + Managing Locality Groups via the Client API
 +
 +[source,java]
 +
 +Connector conn;
 +
 +HashMapString,SetText localityGroups = new HashMapString, SetText();
 +
 +HashSetText metadataColumns = new HashSetText();
 +metadataColumns.add(new Text(domain));
 +metadataColumns.add(new Text(link));
 +
 +HashSetText contentColumns = new HashSetText();
 +contentColumns.add(new Text(body));
 +contentColumns.add(new Text(images));
 +
 +localityGroups.put(metadata, metadataColumns);
 +localityGroups.put(content, contentColumns);
 +
 +conn.tableOperations().setLocalityGroups(mytable, localityGroups);
 +
 +// existing locality groups can be obtained as follows
 +MapString, SetText groups =
 +conn.tableOperations().getLocalityGroups(mytable);
 +
 +
 +The assignment of Column Families to Locality Groups can be changed at any 
time. The
 +physical movement of column families into their new locality groups takes 
place via
 +the periodic Major Compaction process that takes place continuously in the
 +background. Major Compaction can also be scheduled to take place immediately
 +through the shell:
 +
 +  user@myinstance mytable compact -t mytable
 +
 +=== Constraints
 +
 +Accumulo supports constraints applied on mutations at insert time. This can be
 +used to disallow certain inserts according to a user defined policy. Any 
mutation
 +that fails to meet the requirements of the constraint is rejected and sent 
back to the
 +client.
 +
 +Constraints can be enabled by setting a table property as follows:
 +
 +
 +user@myinstance mytable constraint 

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: bbf5b7c3ee3ffa4eb2383fd9a6ec902dbecb0b49
Parents: a1439e3 85942da
Author: Josh Elser els...@apache.org
Authored: Mon Mar 23 18:35:53 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon Mar 23 18:35:53 2015 -0400

--

--

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

[kturner]

Merge branch '1.6'

Conflicts:

server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java


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

Branch: refs/heads/master
Commit: 23f27828f467617c3c97bf272d55eeb7ce63953f
Parents: 4c9fd4d 1ea9010
Author: Keith Turner ktur...@apache.org
Authored: Fri Mar 13 08:53:01 2015 -0400
Committer: Keith Turner ktur...@apache.org
Committed: Fri Mar 13 08:53:01 2015 -0400

--
 .../accumulo/server/master/LiveTServerSet.java  | 25 
 1 file changed, 20 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/23f27828/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
--
diff --cc 
server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
index 917d8d2,332bfc9..c31951f
--- 
a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
@@@ -77,15 -80,30 +77,30 @@@ public class LiveTServerSet implements 
  }
  
  private String lockString(ZooLock mlock) {
 -  return mlock.getLockID().serialize(ZooUtil.getRoot(instance) + 
Constants.ZMASTER_LOCK);
 +  return 
mlock.getLockID().serialize(ZooUtil.getRoot(context.getInstance()) + 
Constants.ZMASTER_LOCK);
  }
  
+ private void loadTablet(TabletClientService.Client client, ZooLock lock, 
KeyExtent extent) throws TException {
 -  client.loadTablet(Tracer.traceInfo(), 
SystemCredentials.get().toThrift(instance), lockString(lock), 
extent.toThrift());
++  client.loadTablet(Tracer.traceInfo(), context.rpcCreds(), 
lockString(lock), extent.toThrift());
+ }
+ 
  public void assignTablet(ZooLock lock, KeyExtent extent) throws 
TException {
-   TabletClientService.Client client = ThriftUtil.getClient(new 
TabletClientService.Client.Factory(), address, context);
-   try {
- client.loadTablet(Tracer.traceInfo(), context.rpcCreds(), 
lockString(lock), extent.toThrift());
-   } finally {
- ThriftUtil.returnClient(client);
+   if (extent.isMeta()) {
+ // see ACCUMULO-3597
 -TTransport transport = ThriftUtil.createTransport(address, conf);
++TTransport transport = ThriftUtil.createTransport(address, context);
+ try {
+   TabletClientService.Client client = ThriftUtil.createClient(new 
TabletClientService.Client.Factory(), transport);
+   loadTablet(client, lock, extent);
+ } finally {
+   transport.close();
+ }
+   } else {
 -TabletClientService.Client client = ThriftUtil.getClient(new 
TabletClientService.Client.Factory(), address, conf);
++TabletClientService.Client client = ThriftUtil.getClient(new 
TabletClientService.Client.Factory(), address, context);
+ try {
+   loadTablet(client, lock, extent);
+ } finally {
+   ThriftUtil.returnClient(client);
+ }
}
  }
  

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

[ecn]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 87208e5de1aacb5e7b2487dafba7705f6237ec80
Parents: 4a9cabe 775cdb1
Author: Eric C. Newton eric.new...@gmail.com
Authored: Wed Mar 4 10:31:47 2015 -0500
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Wed Mar 4 10:31:47 2015 -0500

--
 test/src/test/java/org/apache/accumulo/harness/AccumuloIT.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: a52b238275bd63bfb7d2f84e215921a2993ac475
Parents: 9339ecf 7707793
Author: Josh Elser els...@apache.org
Authored: Tue Mar 3 08:54:42 2015 -0800
Committer: Josh Elser els...@apache.org
Committed: Tue Mar 3 08:54:42 2015 -0800

--

--

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

[ctubbsii]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 4e400f0d2a14a9753152276b663ec73a23383722
Parents: bac5bc5 9dcfa63
Author: Christopher Tubbs ctubb...@apache.org
Authored: Fri Feb 27 12:11:59 2015 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Fri Feb 27 12:11:59 2015 -0500

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4e400f0d/pom.xml
--
diff --cc pom.xml
index 9ea3bee,089901b..d8c6d02
--- a/pom.xml
+++ b/pom.xml
@@@ -639,8 -612,10 +639,8 @@@
  plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-release-plugin/artifactId
 -  !-- Work around MRELEASE-812 --
 -  version2.5/version
configuration
- arguments-P apache-release,thrift,assemble,docs,sunny 
-Dtimeout.factor=2 -Dmavanagaiata.dirtyFlag=false/arguments
+ arguments-P apache-release,thrift,assemble,docs,sunny 
-Dtimeout.factor=2/arguments
  autoVersionSubmodulestrue/autoVersionSubmodules
  goalsclean deploy/goals
  preparationGoalsclean verify/preparationGoals

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: a81e6170cdaccc200925676001037759e677fdb2
Parents: 3a05a5d f47fdfe
Author: Josh Elser els...@apache.org
Authored: Fri Feb 27 18:24:15 2015 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Feb 27 18:24:15 2015 -0500

--
 .../start/classloader/AccumuloClassLoader.java  | 22 ++--
 1 file changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a81e6170/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 3a05a5de8faf11c04a3d2d35044473ab640626ed
Parents: 4e400f0 d1aaecb
Author: Josh Elser els...@apache.org
Authored: Fri Feb 27 17:05:46 2015 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Feb 27 17:05:46 2015 -0500

--
 shell/src/main/java/org/apache/accumulo/shell/Shell.java | 3 +++
 .../java/org/apache/accumulo/shell/ShellSetInstanceTest.java | 4 
 2 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a05a5de/shell/src/main/java/org/apache/accumulo/shell/Shell.java
--
diff --cc shell/src/main/java/org/apache/accumulo/shell/Shell.java
index e519a7c,000..8abafdb
mode 100644,00..100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@@ -1,1266 -1,0 +1,1269 @@@
 +/*
 + * 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.shell;
 +
 +import static java.nio.charset.StandardCharsets.ISO_8859_1;
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
 +import java.io.BufferedWriter;
 +import java.io.File;
 +import java.io.FileNotFoundException;
 +import java.io.FileOutputStream;
 +import java.io.IOException;
 +import java.io.OutputStreamWriter;
 +import java.io.PrintWriter;
 +import java.net.InetAddress;
 +import java.nio.charset.Charset;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.HashMap;
 +import java.util.HashSet;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Locale;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Set;
 +import java.util.TreeMap;
 +import java.util.UUID;
 +import java.util.concurrent.TimeUnit;
 +
 +import jline.console.ConsoleReader;
 +import jline.console.UserInterruptException;
 +import jline.console.history.FileHistory;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.AccumuloException;
 +import org.apache.accumulo.core.client.AccumuloSecurityException;
 +import org.apache.accumulo.core.client.ClientConfiguration;
 +import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.IteratorSetting;
 +import org.apache.accumulo.core.client.NamespaceNotFoundException;
 +import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.ZooKeeperInstance;
 +import org.apache.accumulo.core.client.impl.ClientContext;
 +import org.apache.accumulo.core.client.impl.Tables;
 +import org.apache.accumulo.core.client.mock.MockInstance;
 +import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 +import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.conf.SiteConfiguration;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.data.thrift.TConstraintViolationSummary;
 +import 
org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException;
 +import org.apache.accumulo.core.trace.DistributedTrace;
 +import org.apache.accumulo.core.util.BadArgumentException;
 +import org.apache.accumulo.core.util.format.BinaryFormatter;
 +import org.apache.accumulo.core.util.format.DefaultFormatter;
 +import org.apache.accumulo.core.util.format.Formatter;
 +import org.apache.accumulo.core.util.format.FormatterFactory;
 +import org.apache.accumulo.core.volume.VolumeConfiguration;
 +import 

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 990dafbb2f6e15e3da91671b0506a1d8013269fd
Parents: 678a378 f6dd62f
Author: Josh Elser els...@apache.org
Authored: Tue Feb 17 19:15:27 2015 -0500
Committer: Josh Elser els...@apache.org
Committed: Tue Feb 17 19:15:27 2015 -0500

--
 .../org/apache/accumulo/test/ShellServerIT.java | 26 
 1 file changed, 16 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/990dafbb/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
--

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

[cjnolet]

Merge branch '1.6'

Conflicts:
assemble/pom.xml
core/pom.xml
docs/pom.xml
examples/simple/pom.xml
fate/pom.xml
maven-plugin/pom.xml
minicluster/pom.xml
pom.xml
proxy/pom.xml
server/base/pom.xml
server/gc/pom.xml
server/master/pom.xml
server/monitor/pom.xml
server/native/pom.xml
server/tracer/pom.xml
server/tserver/pom.xml
start/pom.xml
test/pom.xml
trace/pom.xml


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

Branch: refs/heads/master
Commit: 678a3785232338fd4b208d0cb21d3ead34835aea
Parents: d5745da d859e2a
Author: Corey J. Nolet cjno...@gmail.com
Authored: Mon Feb 16 09:48:35 2015 -0500
Committer: Corey J. Nolet cjno...@gmail.com
Committed: Mon Feb 16 09:48:35 2015 -0500

--

--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: a2d272c6f94504a7c2f1701592e07dc01e93f006
Parents: c479f87 5b48c5a
Author: Josh Elser els...@apache.org
Authored: Tue Feb 3 11:12:58 2015 -0500
Committer: Josh Elser els...@apache.org
Committed: Tue Feb 3 11:12:58 2015 -0500

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


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

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 45a027c9c7b1c6adbc4f97abc897baa91ebe0342
Parents: 4c22e9b 9f2fcf4
Author: Josh Elser els...@apache.org
Authored: Fri Jan 23 14:35:43 2015 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 23 14:35:43 2015 -0500

--
 .../vfs/AccumuloReloadingVFSClassLoader.java   | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)
--

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

[ctubbsii]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: a139e7a754f4e01024fcf0ec10f0ba141e516594
Parents: a0dbe56 67dd532
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Jan 22 15:18:57 2015 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Jan 22 15:18:57 2015 -0500

--
 server/tracer/src/main/scripts/generate-thrift.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a139e7a7/server/tracer/src/main/scripts/generate-thrift.sh
--
diff --cc server/tracer/src/main/scripts/generate-thrift.sh
index 3daa98e,000..31acac3
mode 100755,00..100755
--- a/server/tracer/src/main/scripts/generate-thrift.sh
+++ b/server/tracer/src/main/scripts/generate-thrift.sh
@@@ -1,29 -1,0 +1,29 @@@
 +#! /usr/bin/env bash
 +
 +# 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.
 +
 +# This script will regenerate the thrift code for accumulo-trace.
 +INCLUDED_MODULES=(../../core)
 +BASE_OUTPUT_PACKAGE='org.apache.accumulo'
 +PACKAGES_TO_GENERATE=(tracer)
 +
 +. ../../core/src/main/scripts/generate-thrift.sh
 +
 +# Ensure serialVersionUID stays the same for all 1.6.x versions (see 
ACCUMULO-3433, ACCUMULO-3132)
 +sed -i -e 's/\(public class TInfo .*\)$/\1\
 +\
 +  private static final long serialVersionUID = -4659975753252858243l; \/\/ 
See ACCUMULO-3132\
-  /' src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
++/' src/main/java/org/apache/accumulo/trace/thrift/TInfo.java

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 15a459b64cce79984b2ddff10add91caf7b0be9d
Parents: fed4ae8 1df12a7
Author: Josh Elser els...@apache.org
Authored: Wed Jan 21 14:28:28 2015 -0500
Committer: Josh Elser els...@apache.org
Committed: Wed Jan 21 14:28:28 2015 -0500

--
 .../base/src/main/java/org/apache/accumulo/server/Accumulo.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/15a459b6/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
--

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

[ctubbsii]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 700cc0ccdb3e7e1d2b3f1c43168fd2136cd6b7ab
Parents: 15a459b 7ff6169
Author: Christopher Tubbs ctubb...@apache.org
Authored: Wed Jan 21 18:02:25 2015 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Wed Jan 21 18:02:25 2015 -0500

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

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 107a3ff3ee5dc2a3dba6583aa3d114b6f0dbb207
Parents: 5d2f93a c515333
Author: Josh Elser els...@apache.org
Authored: Mon Jan 19 16:06:47 2015 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 19 16:06:47 2015 -0500

--
 .../accumulo/core/client/ZooKeeperInstance.java   |  4 
 .../accumulo/core/client/ZooKeeperInstanceTest.java   | 14 +++---
 .../mapreduce/lib/impl/ConfiguratorBaseTest.java  | 12 +++-
 .../apache/accumulo/test/functional/ReadWriteIT.java  |  7 +++
 4 files changed, 29 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/107a3ff3/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/107a3ff3/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/107a3ff3/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
--

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

[ctubbsii]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 07e74151b56965d0d9328d17ef9be3136e47dae8
Parents: 47a091a 65a8c1a
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Jan 15 11:12:05 2015 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Jan 15 11:12:05 2015 -0500

--
 .../src/main/java/org/apache/accumulo/tserver/NativeMap.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/07e74151/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: fb7540629190204634f75a71fc5c92d9be5e792b
Parents: aae9e97 8a0518a
Author: Josh Elser els...@apache.org
Authored: Thu Jan 15 17:51:07 2015 -0500
Committer: Josh Elser els...@apache.org
Committed: Thu Jan 15 17:51:07 2015 -0500

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

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

[elserj]

Merge branch '1.6'

Conflicts:
docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex


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

Branch: refs/heads/master
Commit: cd11909951103679d9d20ec23aa7716035667e2c
Parents: 23ce1c7 dc58506
Author: Josh Elser els...@apache.org
Authored: Tue Jan 13 18:30:35 2015 -0500
Committer: Josh Elser els...@apache.org
Committed: Tue Jan 13 18:30:35 2015 -0500

--
 .../main/asciidoc/accumulo_user_manual.asciidoc |   2 +
 docs/src/main/asciidoc/chapters/ssl.txt | 134 +++
 2 files changed, 136 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cd119099/docs/src/main/asciidoc/accumulo_user_manual.asciidoc
--
diff --cc docs/src/main/asciidoc/accumulo_user_manual.asciidoc
index ec8e538,000..5884da2
mode 100644,00..100644
--- a/docs/src/main/asciidoc/accumulo_user_manual.asciidoc
+++ b/docs/src/main/asciidoc/accumulo_user_manual.asciidoc
@@@ -1,64 -1,0 +1,66 @@@
 +// 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.
 +
 +Apache Accumulo User Manual Version 1.6
 +===
 +:author: Apache Accumulo Project
 +:email: d...@accumulo.apache.org
 +:toc2:
 +:toclevels: 4
 +:toc-title: Apache Accumulo 1.6
 +:numbered:
 +:website: http://accumulo.apache.org/
 +
 +image::accumulo-logo.png[]
 +
 +Copyright © 2011-2014 The Apache Software Foundation, Licensed under the 
Apache
 +License, Version 2.0.  Apache Accumulo, Accumulo, Apache, and the Apache
 +Accumulo project logo are trademarks of the Apache Software Foundation.
 +
 +include::chapters/introduction.txt[]
 +
 +include::chapters/design.txt[]
 +
 +include::chapters/shell.txt[]
 +
 +include::chapters/clients.txt[]
 +
 +include::chapters/development_clients.txt[]
 +
 +include::chapters/table_configuration.txt[]
 +
 +include::chapters/table_design.txt[]
 +
 +include::chapters/high_speed_ingest.txt[]
 +
 +include::chapters/analytics.txt[]
 +
 +include::chapters/security.txt[]
 +
 +include::chapters/replication.txt[]
 +
 +include::chapters/implementation.txt[]
 +
++include::chapters/ssl.txt[]
++
 +include::chapters/administration.txt[]
 +
 +include::chapters/multivolume.txt[]
 +
 +include::chapters/troubleshooting.txt[]
 +
 +[appendix]
 +include::appendices/config.txt[]
 +

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cd119099/docs/src/main/asciidoc/chapters/ssl.txt
--
diff --cc docs/src/main/asciidoc/chapters/ssl.txt
index 000,000..2abb98d
new file mode 100644
--- /dev/null
+++ b/docs/src/main/asciidoc/chapters/ssl.txt
@@@ -1,0 -1,0 +1,134 @@@
++// 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.
++
++== SSL
++Accumulo, through Thrift's TSSLTransport, provides the ability to encrypt
++wire communication between Accumulo servers and clients using secure
++sockets layer (SSL). SSL certifcates signed by the same certificate authority
++control the circle of trust in which a secure connection can be established.
++Typically, each host 

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 55b60dd65cd73009f1d7edce5ce965f49a4294c7
Parents: 61b0fb7 02142ff
Author: Josh Elser els...@apache.org
Authored: Fri Jan 9 14:44:55 2015 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 9 14:44:55 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/55b60dd6/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 3899eb0f33578b59b52dce5721994f3242605fea
Parents: c2f5946 794e68c
Author: Josh Elser els...@apache.org
Authored: Sun Dec 28 21:26:35 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Sun Dec 28 21:26:35 2014 -0500

--
 .../src/main/java/org/apache/accumulo/server/Accumulo.java   | 7 ---
 .../apache/accumulo/server/watcher/Log4jConfiguration.java   | 8 
 2 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3899eb0f/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
--
diff --cc server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
index 1785acb,46ec64f..c424f1a
--- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
@@@ -155,15 -163,9 +154,9 @@@ public class Accumulo 
  // Set up local file-based logging right away
  Log4jConfiguration logConf = new Log4jConfiguration(logConfigFile);
  logConf.resetLogger();
- 
- // Watch the auditLog.xml for the future updates
- DOMConfigurator.configureAndWatch(auditConfig, 5000);
}
  
 -  public static void init(VolumeManager fs, ServerConfiguration serverConfig, 
String application) throws IOException {
 +  public static void init(VolumeManager fs, ServerConfigurationFactory 
serverConfig, String application) throws IOException {
  final AccumuloConfiguration conf = serverConfig.getConfiguration();
  final Instance instance = serverConfig.getInstance();
  

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: d798d51211857a1e6d7390e04ee903ca8042fd31
Parents: 999115e 9a32ec1
Author: Josh Elser els...@apache.org
Authored: Fri Dec 19 15:45:45 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Dec 19 15:45:45 2014 -0500

--
 .../accumulo/core/client/mapreduce/AbstractInputFormat.java | 2 +-
 .../accumulo/examples/simple/mapreduce/TeraSortIngest.java  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d798d512/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d798d512/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
--
diff --cc 
examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
index afbc4b0,f10ec3e..ade6ce1
--- 
a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
+++ 
b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
@@@ -25,9 -25,10 +25,10 @@@ import java.util.ArrayList
  import java.util.List;
  import java.util.Random;
  
 -import org.apache.accumulo.core.cli.ClientOnRequiredTable;
 +import org.apache.accumulo.core.cli.MapReduceClientOnRequiredTable;
  import org.apache.accumulo.core.client.BatchWriterConfig;
  import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
+ import org.apache.accumulo.core.client.mapreduce.InputFormatBase;
  import org.apache.accumulo.core.data.Mutation;
  import org.apache.accumulo.core.data.Value;
  import org.apache.hadoop.conf.Configuration;

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

[ctubbsii]

Merge branch '1.6'

  Merging with -sours for ACCUMULO-3405


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

Branch: refs/heads/master
Commit: 5bc1d080f234c33d81a7a84ee97e14eaf695fe5b
Parents: 26db8ee cb97321
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Dec 18 18:18:08 2014 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Dec 18 18:18:08 2014 -0500

--

--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 48a857ebe2f4a77a1f0e1093ef7a6f78de725c7b
Parents: 195468f 27d79c2
Author: Josh Elser els...@apache.org
Authored: Thu Dec 18 21:12:33 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Thu Dec 18 21:37:41 2014 -0500

--
 .../src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/48a857eb/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
--
diff --cc shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
index 40d8a7e,000..8167ef8
mode 100644,00..100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
@@@ -1,276 -1,0 +1,280 @@@
 +/*
 + * 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.shell;
 +
 +import java.io.File;
 +import java.io.FileNotFoundException;
 +import java.util.ArrayList;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Scanner;
 +import java.util.TreeMap;
 +
 +import com.beust.jcommander.DynamicParameter;
 +import com.beust.jcommander.IStringConverter;
 +import com.beust.jcommander.Parameter;
 +import com.beust.jcommander.ParameterException;
 +import com.beust.jcommander.converters.FileConverter;
 +import org.apache.accumulo.core.client.ClientConfiguration;
 +import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
 +import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 +import org.apache.commons.configuration.ConfigurationException;
 +import org.apache.commons.configuration.PropertiesConfiguration;
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
 +
 +public class ShellOptionsJC {
++  private static final Logger log = LoggerFactory.getLogger(Shell.class);
 +
 +  @Parameter(names = {-u, --user}, description = username (defaults to 
your OS user))
 +  private String username = System.getProperty(user.name, root);
 +
 +  public static class PasswordConverter implements IStringConverterString {
 +public static final String STDIN = stdin;
 +
 +private enum KeyType {
 +  PASS(pass:), ENV(env:) {
 +@Override
 +String process(String value) {
 +  return System.getenv(value);
 +}
 +  },
 +  FILE(file:) {
 +@Override
 +String process(String value) {
 +  Scanner scanner = null;
 +  try {
 +scanner = new Scanner(new File(value));
 +return scanner.nextLine();
 +  } catch (FileNotFoundException e) {
 +throw new ParameterException(e);
 +  } finally {
 +if (scanner != null) {
 +  scanner.close();
 +}
 +  }
 +}
 +  },
 +  STDIN(PasswordConverter.STDIN) {
 +@Override
 +public boolean matches(String value) {
 +  return prefix.equals(value);
 +}
 +
 +@Override
 +public String convert(String value) {
 +  // Will check for this later
 +  return prefix;
 +}
 +  };
 +
 +  String prefix;
 +
 +  private KeyType(String prefix) {
 +this.prefix = prefix;
 +  }
 +
 +  public boolean matches(String value) {
 +return value.startsWith(prefix);
 +  }
 +
 +  public String convert(String value) {
 +return process(value.substring(prefix.length()));
 +  }
 +
 +  String process(String value) {
 +return value;
 +  }
 +};
 +
 +@Override
 +public String convert(String value) {
 +  for (KeyType keyType : KeyType.values()) {
 +if (keyType.matches(value)) {
 +  

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

[ctubbsii]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 0c63731dafcf07cd496272c1dcfec2488360f8db
Parents: 8260914 76e7fff
Author: Christopher Tubbs ctubb...@apache.org
Authored: Wed Dec 17 21:10:32 2014 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Wed Dec 17 21:10:32 2014 -0500

--

--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 3fbbc828963adbd95b0c88bbf0f62faee9f8499a
Parents: e435611 27d4ee2
Author: Josh Elser els...@apache.org
Authored: Tue Dec 16 15:35:34 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Tue Dec 16 15:35:34 2014 -0500

--
 .../src/main/java/org/apache/accumulo/shell/Shell.java  | 12 +---
 .../java/org/apache/accumulo/shell/ShellConfigTest.java |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fbbc828/shell/src/main/java/org/apache/accumulo/shell/Shell.java
--
diff --cc shell/src/main/java/org/apache/accumulo/shell/Shell.java
index 8aadd68,000..58308ff
mode 100644,00..100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@@ -1,1230 -1,0 +1,1228 @@@
 +/*
 + * 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.shell;
 +
 +import static java.nio.charset.StandardCharsets.ISO_8859_1;
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
 +import java.io.BufferedWriter;
 +import java.io.File;
 +import java.io.FileNotFoundException;
 +import java.io.FileOutputStream;
 +import java.io.IOException;
 +import java.io.OutputStreamWriter;
 +import java.io.PrintWriter;
 +import java.net.InetAddress;
 +import java.nio.charset.Charset;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.HashMap;
 +import java.util.HashSet;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Locale;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Set;
 +import java.util.TreeMap;
 +import java.util.UUID;
 +import java.util.concurrent.TimeUnit;
 +
 +import jline.console.ConsoleReader;
 +import jline.console.UserInterruptException;
 +import jline.console.history.FileHistory;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.AccumuloException;
 +import org.apache.accumulo.core.client.AccumuloSecurityException;
 +import org.apache.accumulo.core.client.ClientConfiguration;
 +import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.IteratorSetting;
 +import org.apache.accumulo.core.client.NamespaceNotFoundException;
 +import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.ZooKeeperInstance;
 +import org.apache.accumulo.core.client.impl.ClientContext;
 +import org.apache.accumulo.core.client.impl.Tables;
 +import org.apache.accumulo.core.client.mock.MockInstance;
 +import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 +import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.conf.SiteConfiguration;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.data.thrift.TConstraintViolationSummary;
 +import 
org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException;
 +import org.apache.accumulo.core.trace.DistributedTrace;
 +import org.apache.accumulo.core.util.BadArgumentException;
 +import org.apache.accumulo.core.util.format.BinaryFormatter;
 +import org.apache.accumulo.core.util.format.DefaultFormatter;
 +import org.apache.accumulo.core.util.format.Formatter;
 +import org.apache.accumulo.core.util.format.FormatterFactory;
 +import org.apache.accumulo.core.volume.VolumeConfiguration;
 +import 

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 39d86d5a15917de92e6d917ea621e89c4c0bdc25
Parents: bf6ca04 a971489
Author: Josh Elser els...@apache.org
Authored: Mon Dec 15 13:12:00 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Dec 15 13:12:00 2014 -0500

--
 .../accumulo/monitor/util/celltypes/PreciseNumberType.java   | 4 ++--
 .../accumulo/monitor/util/celltypes/PreciseNumberTypeTest.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 4cedbeb6073b18936a506be9bf51bf8475b075b8
Parents: 1e9a42c 9558b0d
Author: Josh Elser els...@apache.org
Authored: Mon Dec 15 13:32:55 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Dec 15 13:32:55 2014 -0500

--
 .../java/org/apache/accumulo/master/Master.java | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


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

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

[ctubbsii]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: dadb7bb114c8f99ff9a82a74e508595f640c81fb
Parents: 4cedbeb b6f9a1e
Author: Christopher Tubbs ctubb...@apache.org
Authored: Mon Dec 15 14:08:53 2014 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Mon Dec 15 14:08:53 2014 -0500

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


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

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

[ctubbsii]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: b1dc56ec26c0e6d4492b2a83ad818fb03f106ddb
Parents: dadb7bb 86f7c1b
Author: Christopher Tubbs ctubb...@apache.org
Authored: Mon Dec 15 14:45:06 2014 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Mon Dec 15 14:45:06 2014 -0500

--

--

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

[ctubbsii]

Merge branch '1.6'

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

Branch: refs/heads/master
Commit: 923accb68d7c79467291b6adfca74b114178944e
Parents: bd4d190 c07e3d0
Author: Christopher Tubbs ctubb...@apache.org
Authored: Sat Dec 13 14:18:34 2014 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Sat Dec 13 14:18:34 2014 -0500

--
 .../minicluster/impl/CleanShutdownMacTest.java  |  2 +-
 pom.xml |  9 +
 .../java/org/apache/accumulo/master/Master.java | 16 
 3 files changed, 14 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/923accb6/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/923accb6/pom.xml
--
diff --cc pom.xml
index 31601a1,f40a650..b0300af
--- a/pom.xml
+++ b/pom.xml
@@@ -124,9 -122,9 +124,10 @@@
  forkCount1/forkCount
  !-- overwritten in profiles hadoop-1 or hadoop-2 --
  hadoop.version2.2.0/hadoop.version
 +htrace.version3.0.4/htrace.version
  httpclient.version3.1/httpclient.version
 -java.ver1.6/java.ver
 -jetty.version8.1.15.v20140411/jetty.version
++java.ver1.7/java.ver
 +jetty.version9.1.5.v20140505/jetty.version
  !-- the maven-release-plugin makes this recommendation, due to plugin 
bugs --
  maven.min-version3.0.4/maven.min-version
  !-- surefire/failsafe plugin option --

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

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 04774b1714c5fb9f0a160262045767d4d2a1eefe
Parents: de1d3ee 98c524e
Author: Josh Elser els...@apache.org
Authored: Tue Dec 9 13:11:31 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Tue Dec 9 13:11:31 2014 -0500

--
 .../main/java/org/apache/accumulo/server/rpc/RpcWrapper.java   | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/04774b17/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java
--
diff --cc 
server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java
index 7b34986,000..a488da9
mode 100644,00..100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java
@@@ -1,62 -1,0 +1,64 @@@
 +/*
 + * 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.server.rpc;
 +
 +import java.lang.reflect.InvocationHandler;
 +import java.lang.reflect.Method;
 +import java.lang.reflect.Proxy;
 +
 +import org.apache.accumulo.core.trace.wrappers.RpcServerInvocationHandler;
 +import org.apache.accumulo.core.trace.wrappers.TraceWrap;
 +import org.apache.thrift.TApplicationException;
 +import org.apache.thrift.TException;
++import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +/**
 + * This class accommodates the changes in THRIFT-1805, which appeared in 
Thrift 0.9.1 and restricts client-side notification of server-side errors to
 + * {@link TException} only, by wrapping {@link RuntimeException} and {@link 
Error} as {@link TException}, so it doesn't just close the connection and look 
like
 + * a network issue, but informs the client that a {@link 
TApplicationException} had occurred, as it did in Thrift 0.9.0. This performs 
similar functions as
 + * {@link TraceWrap}, but with the additional action of translating 
exceptions. See also ACCUMULO-1691 and ACCUMULO-2950.
 + *
 + * @since 1.6.1
 + */
 +public class RpcWrapper {
 +
 +  public static T T service(final T instance) {
 +InvocationHandler handler = new RpcServerInvocationHandlerT(instance) {
++  private final Logger log = LoggerFactory.getLogger(instance.getClass());
 +  @Override
 +  public Object invoke(Object obj, Method method, Object[] args) throws 
Throwable {
 +try {
 +  return super.invoke(obj, method, args);
 +} catch (RuntimeException e) {
 +  String msg = e.getMessage();
-   LoggerFactory.getLogger(instance.getClass()).error(msg, e);
++  log.error(msg, e);
 +  throw new TException(msg);
 +} catch (Error e) {
 +  String msg = e.getMessage();
-   LoggerFactory.getLogger(instance.getClass()).error(msg, e);
++  log.error(msg, e);
 +  throw new TException(msg);
 +}
 +  }
 +};
 +
 +@SuppressWarnings(unchecked)
 +T proxiedInstance = (T) 
Proxy.newProxyInstance(instance.getClass().getClassLoader(), 
instance.getClass().getInterfaces(), handler);
 +return proxiedInstance;
 +  }
 +
 +}

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 5953f7845941e5205afc2fa0583b25d80fe187d9
Parents: 27ab732 6289567
Author: Josh Elser els...@apache.org
Authored: Mon Dec 8 12:37:30 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Dec 8 12:37:30 2014 -0500

--
 .../java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java | 3 ---
 .../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 3 ---
 2 files changed, 6 deletions(-)
--


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

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 83690568b5ca853e990575d80c2ae1494db2ea95
Parents: ca4e15b 8f4eae7
Author: Josh Elser els...@apache.org
Authored: Mon Dec 8 16:53:56 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Dec 8 16:53:56 2014 -0500

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


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

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

[elserj]

Merge branch '1.6'

Conflicts:
docs/src/main/latex/accumulo_user_manual/chapters/administration.tex


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

Branch: refs/heads/master
Commit: 7580952a783a5c585a638c5abf811be3131d62d4
Parents: 53991fe 359f851
Author: Josh Elser els...@apache.org
Authored: Sun Dec 7 22:08:17 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Sun Dec 7 22:08:17 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7580952a/docs/src/main/asciidoc/chapters/administration.txt
--
diff --cc docs/src/main/asciidoc/chapters/administration.txt
index bf0b0d1,000..e0e1535
mode 100644,00..100644
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@@ -1,602 -1,0 +1,631 @@@
 +// 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.
 +
 +== Administration
 +
 +=== Hardware
 +
 +Because we are running essentially two or three systems simultaneously layered
 +across the cluster: HDFS, Accumulo and MapReduce, it is typical for hardware 
to
 +consist of 4 to 8 cores, and 8 to 32 GB RAM. This is so each running process 
can have
 +at least one core and 2 - 4 GB each.
 +
 +One core running HDFS can typically keep 2 to 4 disks busy, so each machine 
may
 +typically have as little as 2 x 300GB disks and as much as 4 x 1TB or 2TB 
disks.
 +
 +It is possible to do with less than this, such as with 1u servers with 2 
cores and 4GB
 +each, but in this case it is recommended to only run up to two processes per
 +machine -- i.e. DataNode and TabletServer or DataNode and MapReduce worker but
 +not all three. The constraint here is having enough available heap space for 
all the
 +processes on a machine.
 +
 +=== Network
 +
 +Accumulo communicates via remote procedure calls over TCP/IP for both passing
 +data and control messages. In addition, Accumulo uses HDFS clients to
 +communicate with HDFS. To achieve good ingest and query performance, 
sufficient
 +network bandwidth must be available between any two machines.
 +
 +In addition to needing access to ports associated with HDFS and ZooKeeper, 
Accumulo will
 +use the following default ports. Please make sure that they are open, or 
change
 +their value in conf/accumulo-site.xml.
 +
 +.Accumulo default ports
 +[width=75%,cols=,^2,^2]
 +[options=header]
 +|
 +|Port | Description | Property Name
 +|4445 | Shutdown Port (Accumulo MiniCluster) | n/a
 +|4560 | Accumulo monitor (for centralized log display) | monitor.port.log4j
 +|9997 | Tablet Server | tserver.port.client
 +| | Master Server | master.port.client
 +|12234 | Accumulo Tracer | trace.port.client
 +|42424 | Accumulo Proxy Server | n/a
 +|50091 | Accumulo GC | gc.port.client
 +|50095 | Accumulo HTTP monitor | monitor.port.client
 +|10001 | Master Replication service | master.replication.coordinator.port
 +|10002 | TabletServer Replication service | replication.receipt.service.port
 +|
 +
 +In addition, the user can provide +0+ and an ephemeral port will be chosen 
instead. This
 +ephemeral port is likely to be unique and not already bound. Thus, 
configuring ports to
 +use +0+ instead of an explicit value, should, in most cases, work around any 
issues of
 +running multiple distinct Accumulo instances (or any other process which 
tries to use the
 +same default ports) on the same hardware.
 +
 +=== Installation
 +Choose a directory for the Accumulo installation. This directory will be 
referenced
 +by the environment variable +$ACCUMULO_HOME+. Run the following:
 +
 +  $ tar xzf accumulo-1.6.0-bin.tar.gz# unpack to subdirectory
 +  $ mv accumulo-1.6.0 $ACCUMULO_HOME # move to desired location
 +
 +Repeat this 

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

[elserj]

Merge branch '1.6'

Conflicts:
docs/src/main/latex/accumulo_user_manual/chapters/administration.tex


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

Branch: refs/heads/master
Commit: 27ab732d9bd36aa1ac284f741f27d2be6134acb4
Parents: 7580952 db58b0c
Author: Josh Elser els...@apache.org
Authored: Sun Dec 7 22:12:59 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Sun Dec 7 22:12:59 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/27ab732d/docs/src/main/asciidoc/chapters/administration.txt
--
diff --cc docs/src/main/asciidoc/chapters/administration.txt
index e0e1535,000..2044653
mode 100644,00..100644
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@@ -1,631 -1,0 +1,633 @@@
 +// 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.
 +
 +== Administration
 +
 +=== Hardware
 +
 +Because we are running essentially two or three systems simultaneously layered
 +across the cluster: HDFS, Accumulo and MapReduce, it is typical for hardware 
to
 +consist of 4 to 8 cores, and 8 to 32 GB RAM. This is so each running process 
can have
 +at least one core and 2 - 4 GB each.
 +
 +One core running HDFS can typically keep 2 to 4 disks busy, so each machine 
may
 +typically have as little as 2 x 300GB disks and as much as 4 x 1TB or 2TB 
disks.
 +
 +It is possible to do with less than this, such as with 1u servers with 2 
cores and 4GB
 +each, but in this case it is recommended to only run up to two processes per
 +machine -- i.e. DataNode and TabletServer or DataNode and MapReduce worker but
 +not all three. The constraint here is having enough available heap space for 
all the
 +processes on a machine.
 +
 +=== Network
 +
 +Accumulo communicates via remote procedure calls over TCP/IP for both passing
 +data and control messages. In addition, Accumulo uses HDFS clients to
 +communicate with HDFS. To achieve good ingest and query performance, 
sufficient
 +network bandwidth must be available between any two machines.
 +
 +In addition to needing access to ports associated with HDFS and ZooKeeper, 
Accumulo will
 +use the following default ports. Please make sure that they are open, or 
change
 +their value in conf/accumulo-site.xml.
 +
 +.Accumulo default ports
 +[width=75%,cols=,^2,^2]
 +[options=header]
 +|
 +|Port | Description | Property Name
 +|4445 | Shutdown Port (Accumulo MiniCluster) | n/a
 +|4560 | Accumulo monitor (for centralized log display) | monitor.port.log4j
 +|9997 | Tablet Server | tserver.port.client
 +| | Master Server | master.port.client
 +|12234 | Accumulo Tracer | trace.port.client
 +|42424 | Accumulo Proxy Server | n/a
 +|50091 | Accumulo GC | gc.port.client
 +|50095 | Accumulo HTTP monitor | monitor.port.client
 +|10001 | Master Replication service | master.replication.coordinator.port
 +|10002 | TabletServer Replication service | replication.receipt.service.port
 +|
 +
 +In addition, the user can provide +0+ and an ephemeral port will be chosen 
instead. This
 +ephemeral port is likely to be unique and not already bound. Thus, 
configuring ports to
 +use +0+ instead of an explicit value, should, in most cases, work around any 
issues of
 +running multiple distinct Accumulo instances (or any other process which 
tries to use the
 +same default ports) on the same hardware.
 +
 +=== Installation
 +Choose a directory for the Accumulo installation. This directory will be 
referenced
 +by the environment variable +$ACCUMULO_HOME+. Run the following:
 +
 +  $ tar xzf accumulo-1.6.0-bin.tar.gz# unpack to subdirectory
 +  $ mv accumulo-1.6.0 $ACCUMULO_HOME # move to desired location
 +
 +Repeat this step at each 

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

[ctubbsii]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 54475e5c15434eabfcbe130fdad157536642f21f
Parents: 692312b 3bb20cd
Author: Christopher Tubbs ctubb...@apache.org
Authored: Mon Dec 1 19:34:48 2014 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Mon Dec 1 19:34:48 2014 -0500

--
 .../main/java/org/apache/accumulo/cluster/AccumuloCluster.java   | 4 
 .../java/org/apache/accumulo/cluster/RemoteShellOptions.java | 2 +-
 .../test/java/org/apache/accumulo/harness/AccumuloClusterIT.java | 2 --
 .../java/org/apache/accumulo/harness/MiniClusterHarness.java | 4 
 4 files changed, 1 insertion(+), 11 deletions(-)
--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: ebb0e1d7b83dd9c80a76f45df3ee630b9afcfd8e
Parents: 54475e5 1d288cf
Author: Josh Elser els...@apache.org
Authored: Mon Dec 1 22:49:43 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Dec 1 22:49:43 2014 -0500

--
 .../java/org/apache/accumulo/server/client/BulkImporter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ebb0e1d7/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
--
diff --cc 
server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
index 5496eb4,4cc13a9..593d9b7
--- 
a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
@@@ -140,9 -146,9 +140,9 @@@ public class BulkImporter 
public void run() {
  ListTabletLocation tabletsToAssignMapFileTo = 
Collections.emptyList();
  try {
 -  tabletsToAssignMapFileTo = 
findOverlappingTablets(ServerConfiguration.getSystemConfiguration(instance), 
fs, locator, mapFile, credentials);
 +  tabletsToAssignMapFileTo = findOverlappingTablets(context, fs, 
locator, mapFile);
  } catch (Exception ex) {
-   log.warn(Unable to find tablets that overlap file  + 
mapFile.toString());
+   log.warn(Unable to find tablets that overlap file  + 
mapFile.toString(), ex);
  }
  log.debug(Map file  + mapFile +  found to overlap  + 
tabletsToAssignMapFileTo.size() +  tablets);
  if (tabletsToAssignMapFileTo.size() == 0) {

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 89d0499710f441b5d8f67f88cb9a0cd5af0403bc
Parents: 9e2867d 07e5e66
Author: Josh Elser els...@apache.org
Authored: Fri Nov 21 12:40:51 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Nov 21 12:40:51 2014 -0500

--
 .../test/java/org/apache/accumulo/test/functional/ReadWriteIT.java  | 1 +
 1 file changed, 1 insertion(+)
--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 2ab616a6427f7771a957131747a9f17f3e71003e
Parents: 6166406 c5197aa
Author: Josh Elser els...@apache.org
Authored: Fri Nov 21 16:43:09 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Nov 21 16:43:09 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ab616a6/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
--

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

[elserj]

Merge branch '1.6'

Conflicts:

core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java

core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java

core/src/test/java/org/apache/accumulo/core/util/shell/commands/FormatterCommandTest.java

core/src/test/java/org/apache/accumulo/core/util/shell/commands/HistoryCommandTest.java

shell/src/main/java/org/apache/accumulo/shell/commands/DeleteTableCommand.java

shell/src/test/java/org/apache/accumulo/shell/command/FormatterCommandTest.java

shell/src/test/java/org/apache/accumulo/shell/command/HistoryCommandTest.java


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

Branch: refs/heads/master
Commit: e7d0397cf4ac97a67b111d2cbe3bc195c60a8791
Parents: c51d424 7f8ef55
Author: Josh Elser els...@apache.org
Authored: Thu Nov 20 11:51:16 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Thu Nov 20 11:51:16 2014 -0500

--
 .../shell/commands/DeleteTableCommand.java  |  23 +++
 .../accumulo/shell/commands/TableOperation.java |  16 +-
 .../shell/command/DropUserCommandTest.java  |  83 -
 .../shell/command/FormatterCommandTest.java | 184 ---
 .../shell/command/HistoryCommandTest.java   |  90 -
 .../shell/commands/DeleteTableCommandTest.java  |  42 +
 .../shell/commands/DropUserCommandTest.java |  83 +
 .../shell/commands/FormatterCommandTest.java| 184 +++
 .../shell/commands/HistoryCommandTest.java  |  90 +
 9 files changed, 437 insertions(+), 358 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7d0397c/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteTableCommand.java
--
diff --cc 
shell/src/main/java/org/apache/accumulo/shell/commands/DeleteTableCommand.java
index 827a8ec,000..55a457c
mode 100644,00..100644
--- 
a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteTableCommand.java
+++ 
b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteTableCommand.java
@@@ -1,60 -1,0 +1,83 @@@
 +/*
 + * 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.shell.commands;
 +
++import java.util.Iterator;
++import java.util.Set;
++
++import org.apache.accumulo.core.client.impl.Namespaces;
++import org.apache.accumulo.core.client.impl.Tables;
++import org.apache.accumulo.core.util.Pair;
 +import org.apache.accumulo.shell.Shell;
 +import org.apache.commons.cli.CommandLine;
 +import org.apache.commons.cli.Option;
 +import org.apache.commons.cli.Options;
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
 +
 +public class DeleteTableCommand extends TableOperation {
++  private static final Logger log = 
LoggerFactory.getLogger(DeleteTableCommand.class);
++
 +  private Option forceOpt;
 +
 +  @Override
 +  public int execute(final String fullCommand, final CommandLine cl, final 
Shell shellState) throws Exception {
 +if (cl.hasOption(forceOpt.getOpt())) {
 +  super.force();
 +} else {
 +  super.noForce();
 +}
 +return super.execute(fullCommand, cl, shellState);
 +  }
 +
 +  @Override
 +  public String description() {
 +return deletes a table;
 +  }
 +
 +  @Override
 +  protected void doTableOp(final Shell shellState, final String tableName) 
throws Exception {
 +shellState.getConnector().tableOperations().delete(tableName);
 +shellState.getReader().println(Table: [ + tableName + ] has been 
deleted.);
 +
 +if (shellState.getTableName().equals(tableName)) {
 +  shellState.setTableName();
 +}
 +  }
 +
 +  @Override
 +  public Options getOptions() {
 +forceOpt = new Option(f, force, false, force deletion without 
prompting);
 +final Options opts = 

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

[elserj]

Merge branch '1.6'

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

Branch: refs/heads/master
Commit: 4062b34369f00031f80feb33f34b8f5b91e5abbf
Parents: e7d0397 d470f05
Author: Josh Elser els...@apache.org
Authored: Thu Nov 20 13:18:38 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Thu Nov 20 13:42:37 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4062b343/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
index 571d85c,000..c9445c6
mode 100644,00..100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
@@@ -1,309 -1,0 +1,313 @@@
 +/*
 + * 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.tserver.session;
 +
 +import java.security.SecureRandom;
 +import java.util.ArrayList;
 +import java.util.HashMap;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.TimerTask;
 +
 +import org.apache.accumulo.core.client.impl.Translator;
 +import org.apache.accumulo.core.client.impl.Translators;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.thrift.MultiScanResult;
 +import org.apache.accumulo.core.tabletserver.thrift.ActiveScan;
 +import org.apache.accumulo.core.tabletserver.thrift.ScanState;
 +import org.apache.accumulo.core.tabletserver.thrift.ScanType;
 +import org.apache.accumulo.core.util.MapCounter;
 +import org.apache.accumulo.server.util.time.SimpleTimer;
 +import org.apache.accumulo.tserver.scan.ScanRunState;
 +import org.apache.accumulo.tserver.scan.ScanTask;
 +import org.apache.accumulo.tserver.tablet.ScanBatch;
++import org.apache.log4j.Logger;
 +
 +public class SessionManager {
++  private static final Logger log = Logger.getLogger(SessionManager.class);
 +
 +  private final SecureRandom random = new SecureRandom();
 +  private final MapLong,Session sessions = new HashMapLong,Session();
 +  private final long maxIdle;
 +  private final AccumuloConfiguration aconf;
 +
 +  public SessionManager(AccumuloConfiguration conf) {
 +aconf = conf;
 +maxIdle = conf.getTimeInMillis(Property.TSERV_SESSION_MAXIDLE);
 +
 +Runnable r = new Runnable() {
 +  @Override
 +  public void run() {
 +sweep(maxIdle);
 +  }
 +};
 +
 +SimpleTimer.getInstance(conf).schedule(r, 0, Math.max(maxIdle / 2, 1000));
 +  }
 +
 +  public synchronized long createSession(Session session, boolean reserve) {
 +long sid = random.nextLong();
 +
 +while (sessions.containsKey(sid)) {
 +  sid = random.nextLong();
 +}
 +
 +sessions.put(sid, session);
 +
 +session.reserved = reserve;
 +
 +session.startTime = session.lastAccessTime = System.currentTimeMillis();
 +
 +return sid;
 +  }
 +
 +  public long getMaxIdleTime() {
 +return maxIdle;
 +  }
 +
 +  /**
 +   * while a session is reserved, it cannot be canceled or removed
 +   */
 +
 +  public synchronized Session reserveSession(long sessionId) {
 +Session session = sessions.get(sessionId);
 +if (session != null) {
 +  if (session.reserved)
 +throw new IllegalStateException();
 +  session.reserved = true;
 +}
 +
 +return session;
 +
 +  }
 +
 +  public synchronized Session reserveSession(long 

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

[elserj]

Merge branch '1.6'

Conflicts:
assemble/bin/bootstrap_config.sh


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

Branch: refs/heads/master
Commit: a711ae97f7924e65303702019ceac5a75f4a0a1b
Parents: 60e0b40 7ccae95
Author: Josh Elser els...@apache.org
Authored: Tue Nov 18 12:21:43 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Tue Nov 18 12:21:43 2014 -0500

--
 assemble/bin/bootstrap_config.sh  | 61 +++---
 assemble/conf/templates/accumulo-site.xml |  7 ++-
 2 files changed, 62 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a711ae97/assemble/bin/bootstrap_config.sh
--
diff --cc assemble/bin/bootstrap_config.sh
index 681924f,42b83ad..bc94a34
--- a/assemble/bin/bootstrap_config.sh
+++ b/assemble/bin/bootstrap_config.sh
@@@ -294,12 -298,59 +298,59 @@@ sed -e s/\${memMapMax}/${!MEMORY_MAP_M
  
  #Configure for hadoop 1
  if [[ $HADOOP_VERSION = 1 ]]; then
 -  sed -e 's/^test -z \$HADOOP_CONF_DIR\/#test -z \$HADOOP_CONF_DIR\/' -e 
's/^# test -z $HADOOP_CONF_DIR/test -z \$HADOOP_CONF_DIR\/' 
${CONF_DIR}/$ACCUMULO_ENV  temp
 -  mv temp ${CONF_DIR}/$ACCUMULO_ENV
 +  sed -e 's/^test -z \$HADOOP_CONF_DIR\/#test -z \$HADOOP_CONF_DIR\/' -e 
's/^# test -z $HADOOP_CONF_DIR/test -z \$HADOOP_CONF_DIR\/' 
${CONF_DIR}/$ACCUMULO_ENV  temp
 +  mv temp ${CONF_DIR}/$ACCUMULO_ENV
sed -e 's/!-- Hadoop 2 requirements --/!-- Hadoop 2 requirements 
--!--/' \
-e 's/!-- End Hadoop 2 requirements --/--!-- End Hadoop 2 
requirements --/' \
 -  ${CONF_DIR}/$ACCUMULO_SITE  temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
 +  ${CONF_DIR}/$ACCUMULO_SITE  temp
 +  mv temp ${CONF_DIR}/$ACCUMULO_SITE
+   sed -e 's/!-- HDP 2.0 requirements --/!-- HDP 2.0 requirements --!--/' 
\
+   -e 's/!-- End HDP 2.0 requirements --/--!-- End HDP 2.0 
requirements --/' \
 -  ${CONF_DIR}/$ACCUMULO_SITE  temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++  ${CONF_DIR}/$ACCUMULO_SITE  temp
++  mv temp ${CONF_DIR}/$ACCUMULO_SITE
+   sed -e 's/!-- HDP 2.2 requirements --/!-- HDP 2.2 requirements --!--/' 
\
+   -e 's/!-- End HDP 2.2 requirements --/--!-- End HDP 2.2 
requirements --/' \
 -  ${CONF_DIR}/$ACCUMULO_SITE  temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++  ${CONF_DIR}/$ACCUMULO_SITE  temp
++  mv temp ${CONF_DIR}/$ACCUMULO_SITE
+ elif [[ ${HADOOP_VERSION} == 2 ]]; then
+   sed -e 's/!-- Hadoop 1 requirements --/!-- Hadoop 1 requirements 
--!--/' \
+   -e 's/!-- End Hadoop 1 requirements --/--!-- End Hadoop 1 
requirements --/' \
 -  ${CONF_DIR}/$ACCUMULO_SITE  temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++  ${CONF_DIR}/$ACCUMULO_SITE  temp
++  mv temp ${CONF_DIR}/$ACCUMULO_SITE
+   sed -e 's/!-- HDP 2.0 requirements --/!-- HDP 2.0 requirements --!--/' 
\
+   -e 's/!-- End HDP 2.0 requirements --/--!-- End HDP 2.0 
requirements --/' \
 -  ${CONF_DIR}/$ACCUMULO_SITE  temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++  ${CONF_DIR}/$ACCUMULO_SITE  temp
++  mv temp ${CONF_DIR}/$ACCUMULO_SITE
+   sed -e 's/!-- HDP 2.2 requirements --/!-- HDP 2.2 requirements --!--/' 
\
+   -e 's/!-- End HDP 2.2 requirements --/--!-- End HDP 2.2 
requirements --/' \
 -  ${CONF_DIR}/$ACCUMULO_SITE  temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++  ${CONF_DIR}/$ACCUMULO_SITE  temp
++  mv temp ${CONF_DIR}/$ACCUMULO_SITE
+ elif [[ ${HADOOP_VERSION} == HDP2 ]]; then
+   sed -e 's/!-- Hadoop 1 requirements --/!-- Hadoop 1 requirements 
--!--/' \
+   -e 's/!-- End Hadoop 1 requirements --/--!-- End Hadoop 1 
requirements --/' \
 -  ${CONF_DIR}/$ACCUMULO_SITE  temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++  ${CONF_DIR}/$ACCUMULO_SITE  temp
++  mv temp ${CONF_DIR}/$ACCUMULO_SITE
+   sed -e 's/!-- Hadoop 2 requirements --/!-- Hadoop 2 requirements 
--!--/' \
+   -e 's/!-- End Hadoop 2 requirements --/--!-- End Hadoop 2 
requirements --/' \
 -  ${CONF_DIR}/$ACCUMULO_SITE  temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++  ${CONF_DIR}/$ACCUMULO_SITE  temp
++  mv temp ${CONF_DIR}/$ACCUMULO_SITE
+   sed -e 's/!-- HDP 2.2 requirements --/!-- HDP 2.2 requirements --!--/' 
\
+   -e 's/!-- End HDP 2.2 requirements --/--!-- End HDP 2.2 
requirements --/' \
 -  ${CONF_DIR}/$ACCUMULO_SITE  temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++  ${CONF_DIR}/$ACCUMULO_SITE  temp
++  mv temp ${CONF_DIR}/$ACCUMULO_SITE
+ elif [[ ${HADOOP_VERSION} == HDP2.2 ]]; then
+   sed -e 's/!-- Hadoop 1 requirements --/!-- Hadoop 1 requirements 
--!--/' \
+   -e 's/!-- End Hadoop 1 requirements --/--!-- 

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

[elserj]

Merge branch '1.6'

Conflicts:
test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java


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

Branch: refs/heads/master
Commit: 58af0ce9f04cb1efa59f69c8abdeb87e3c73504c
Parents: 60969b3 27269c4
Author: Josh Elser els...@apache.org
Authored: Thu Nov 13 10:53:08 2014 -0800
Committer: Josh Elser els...@apache.org
Committed: Thu Nov 13 10:53:08 2014 -0800

--
 .../org/apache/accumulo/test/functional/BulkFileIT.java | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/58af0ce9/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 60969b3e0abbead8d60afb3806d61589cf187f09
Parents: e595c17 7f1a55b
Author: Josh Elser els...@apache.org
Authored: Wed Nov 12 16:33:28 2014 -0800
Committer: Josh Elser els...@apache.org
Committed: Wed Nov 12 16:33:28 2014 -0800

--
 .../org/apache/accumulo/server/client/ClientServiceHandler.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/60969b3e/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 581aed8a2c9dcce13a9eb43b7fc4f490e3d47047
Parents: cdf01d7 f984082
Author: Josh Elser els...@apache.org
Authored: Mon Nov 10 15:22:17 2014 -0800
Committer: Josh Elser els...@apache.org
Committed: Mon Nov 10 15:22:17 2014 -0800

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

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 7e0121d11dd7413161d101b8cd5df0fca8b614a7
Parents: 566839e 520d802
Author: Josh Elser els...@apache.org
Authored: Fri Nov 7 19:19:20 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Nov 7 19:19:20 2014 -0500

--
 .../org/apache/accumulo/core/conf/Property.java |   5 +
 .../accumulo/core/util/SslConnectionParams.java | 104 +++---
 .../apache/accumulo/core/util/ThriftUtil.java   | 200 ++-
 .../org/apache/accumulo/server/Accumulo.java|   2 +-
 4 files changed, 282 insertions(+), 29 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7e0121d1/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7e0121d1/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
--

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

[elserj]

Merge branch '1.6'


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

Branch: refs/heads/master
Commit: b5d7b9485c5094330783b71395ce2fd584076bb9
Parents: cc48e37 fa978b0
Author: Josh Elser els...@apache.org
Authored: Thu Nov 6 23:39:12 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Thu Nov 6 23:39:12 2014 -0500

--
 .../accumulo/server/util/MetadataTableUtil.java |  2 +-
 .../accumulo/test/functional/CloneTestIT.java   | 90 +++-
 2 files changed, 90 insertions(+), 2 deletions(-)
--


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