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

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 6fbf2d2b6c843dcaedd5740e80f8ce7c408c734b
Parents: 8ac30b8 d42b770
Author: Christopher Tubbs 
Authored: Fri Apr 15 19:23:39 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Apr 15 19:23:39 2016 -0400

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

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

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 5cb5b9372103761c829403c03007b9f53241400f
Parents: 0f2f80d 422815a
Author: Christopher Tubbs 
Authored: Mon Mar 14 20:46:03 2016 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 14 20:46:03 2016 -0400

--
 .../java/org/apache/accumulo/shell/commands/DeleteRowsCommand.java  | 1 -
 1 file changed, 1 deletion(-)
--

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

[kturner]

Merge branch '1.7'

Conflicts:

core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java

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

server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java


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

Branch: refs/heads/master
Commit: 4eadac16bb509f72696dfcf79afa84ecd1cc1adf
Parents: 97ce2a7 d4882a1
Author: Keith Turner 
Authored: Wed Jan 27 20:41:17 2016 -0500
Committer: Keith Turner 
Committed: Wed Jan 27 20:41:17 2016 -0500

--
 .../core/client/impl/CompressedIterators.java   |  14 +-
 .../core/client/impl/ConditionalWriterImpl.java |  46 +-
 .../accumulo/core/iterators/IteratorUtil.java   |  89 +-
 .../client/impl/ConditionalComparatorTest.java  |  53 ++
 .../tserver/ConditionCheckerContext.java| 164 +++
 .../apache/accumulo/tserver/TabletServer.java   |  79 +++--
 .../accumulo/tserver/tablet/ScanDataSource.java |  19 ++-
 .../apache/accumulo/tserver/tablet/Tablet.java  |  18 ++
 .../accumulo/test/ConditionalWriterIT.java  | 139 +++-
 9 files changed, 506 insertions(+), 115 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4eadac16/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 546de9c,c7756ad..c9ef101
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@@ -17,6 -17,6 +17,7 @@@
  
  package org.apache.accumulo.core.client.impl;
  
++import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
  import static java.nio.charset.StandardCharsets.UTF_8;
  
  import java.nio.ByteBuffer;
@@@ -74,6 -76,8 +77,7 @@@ import org.apache.accumulo.core.trace.T
  import org.apache.accumulo.core.trace.thrift.TInfo;
  import org.apache.accumulo.core.util.BadArgumentException;
  import org.apache.accumulo.core.util.ByteBufferUtil;
+ import org.apache.accumulo.core.util.NamingThreadFactory;
 -import org.apache.accumulo.core.util.UtilWaitThread;
  import org.apache.accumulo.core.zookeeper.ZooUtil;
  import org.apache.accumulo.fate.util.LoggingRunnable;
  import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4eadac16/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
index 6523367,c739e56..6fee4e6
--- a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
@@@ -217,10 -205,20 +205,14 @@@ public class IteratorUtil 
  return loadIterators(scope, source, extent, conf, ssiList, ssio, env, 
true);
}
  
 -  public static ,V extends Writable> 
SortedKeyValueIterator loadIterators(IteratorScope scope,
 -  SortedKeyValueIterator source, KeyExtent extent, 
AccumuloConfiguration conf, List ssiList, 
Map> ssio,
 -  IteratorEnvironment env, boolean useAccumuloClassLoader) throws 
IOException {
 -List iters = new ArrayList(ssiList);
 -Map> allOptions = new 
HashMap>();
 -
 +  private static void parseIteratorConfiguration(IteratorScope scope, 
List iters, Map> ssio,
 +  Map> allOptions, AccumuloConfiguration conf) {
  parseIterConf(scope, iters, allOptions, conf);
  
+ mergeOptions(ssio, allOptions);
 -
 -return loadIterators(source, iters, allOptions, env, 
useAccumuloClassLoader, conf.get(Property.TABLE_CLASSPATH));
+   }
+ 
+   private static void mergeOptions(Map> ssio, 
Map> allOptions) {
  for (Entry> entry : ssio.entrySet()) {
if (entry.getValue() == null)
  continue;
@@@ -233,25 -231,6 +225,24 @@@
  }
}
  
 +  public static ,V extends Writable> 
SortedKeyValueIterator loadIterators(IteratorScope scope,
 +  SortedKeyValueIterator source, KeyExtent extent, 

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

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 04e91398b894768d053a4bc237e23285aaac5d34
Parents: 8f52ab2 071c507
Author: Josh Elser 
Authored: Sat Oct 24 17:04:08 2015 -0400
Committer: Josh Elser 
Committed: Sat Oct 24 17:04:08 2015 -0400

--
 assemble/bin/bootstrap_config.sh| 29 +++-
 assemble/conf/templates/accumulo-site.xml   |  9 ++
 .../accumulo/gc/GarbageCollectionAlgorithm.java |  5 ++--
 3 files changed, 39 insertions(+), 4 deletions(-)
--


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

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

[ecn]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 17ae2f919024daef4a6b4dff7ac92aefd8805de2
Parents: 18e834e 0013e46
Author: Eric C. Newton 
Authored: Fri Oct 2 13:15:30 2015 -0400
Committer: Eric C. Newton 
Committed: Fri Oct 2 13:15:30 2015 -0400

--
 .../accumulo/core/iterators/Combiner.java   |  97 ++-
 .../core/iterators/CombinerTestUtil.java|  23 +++
 .../iterators/user/BigDecimalCombinerTest.java  |   6 +-
 .../core/iterators/user/CombinerTest.java   | 170 ---
 .../accumulo/tserver/CompactionQueue.java   |  10 +-
 5 files changed, 280 insertions(+), 26 deletions(-)
--

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

[ecn]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 121cc6bc0e04167ca110f88f841ccfd38b10f5ba
Parents: eabdc83 7985b91
Author: Eric C. Newton eric.new...@gmail.com
Authored: Tue Jun 23 15:33:55 2015 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Tue Jun 23 15:33:55 2015 -0400

--
 .../java/org/apache/accumulo/master/Master.java |  4 +-
 .../accumulo/test/DetectDeadTabletServers.java  | 96 
 2 files changed, 98 insertions(+), 2 deletions(-)
--


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

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

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 5eede28e0dd0d00874c5f67a24de204226066ca0
Parents: 844166a 341034a
Author: Christopher Tubbs ctubb...@apache.org
Authored: Fri Jun 12 11:59:03 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Fri Jun 12 11:59:03 2015 -0400

--
 .../apache/accumulo/core/client/lexicoder/AbstractEncoder.java  | 2 +-
 .../core/client/lexicoder/impl/AbstractLexicoderTest.java   | 5 -
 2 files changed, 1 insertion(+), 6 deletions(-)
--

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

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 6965c41c12b9a51e4d5d08ee022975dc8cf28958
Parents: e6e85cf c5aa060
Author: Josh Elser els...@apache.org
Authored: Wed Jun 3 21:00:12 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Jun 3 21:00:12 2015 -0400

--
 .../apache/accumulo/core/conf/PropertyType.java |  2 +-
 .../accumulo/core/conf/PropertyTypeTest.java| 15 
 .../accumulo/server/master/LiveTServerSet.java  | 27 +-
 .../org/apache/accumulo/server/util/Admin.java  | 45 +-
 .../server/master/LiveTServerSetTest.java   | 52 +++
 .../apache/accumulo/server/util/AdminTest.java  | 94 
 .../master/MasterClientServiceHandler.java  |  5 ++
 .../master/tserverOps/ShutdownTServer.java  |  2 +-
 8 files changed, 235 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6965c41c/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
--

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

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: d1cb76a488a7083b287c6954f35426d39c7d4312
Parents: b37ee94 7bd6634
Author: Josh Elser els...@apache.org
Authored: Wed May 27 16:54:36 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 27 16:54:36 2015 -0400

--
 .../accumulo/tracer/AsyncSpanReceiver.java  |  4 +--
 .../apache/accumulo/tracer/ZooTraceClient.java  |  1 +
 .../accumulo/test/proxy/SimpleProxyBase.java| 32 ++--
 3 files changed, 26 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1cb76a4/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
--
diff --cc test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
index 6828c40,000..e4bb836
mode 100644,00..100644
--- a/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
+++ b/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
@@@ -1,1906 -1,0 +1,1920 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the License); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an AS IS BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.test.proxy;
 +
 +import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
 +import static org.junit.Assert.assertNotEquals;
 +import static org.junit.Assert.assertNotNull;
 +import static org.junit.Assert.assertTrue;
 +import static org.junit.Assert.fail;
 +
 +import java.io.BufferedReader;
 +import java.io.File;
 +import java.io.InputStreamReader;
 +import java.nio.ByteBuffer;
 +import java.nio.file.Files;
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.EnumSet;
 +import java.util.HashMap;
 +import java.util.HashSet;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Properties;
 +import java.util.Set;
 +import java.util.TreeMap;
 +import java.util.UUID;
 +
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 +import org.apache.accumulo.core.conf.DefaultConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.file.FileOperations;
 +import org.apache.accumulo.core.file.FileSKVWriter;
 +import org.apache.accumulo.core.iterators.DevNull;
 +import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 +import org.apache.accumulo.core.iterators.user.SummingCombiner;
 +import org.apache.accumulo.core.iterators.user.VersioningIterator;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.core.util.ByteBufferUtil;
 +import org.apache.accumulo.core.util.UtilWaitThread;
 +import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint;
 +import org.apache.accumulo.harness.SharedMiniClusterIT;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
 +import org.apache.accumulo.proxy.Proxy;
 +import org.apache.accumulo.proxy.thrift.AccumuloProxy.Client;
 +import org.apache.accumulo.proxy.thrift.AccumuloSecurityException;
 +import org.apache.accumulo.proxy.thrift.ActiveCompaction;
 +import org.apache.accumulo.proxy.thrift.ActiveScan;
 +import org.apache.accumulo.proxy.thrift.BatchScanOptions;
 +import org.apache.accumulo.proxy.thrift.Column;
 +import org.apache.accumulo.proxy.thrift.ColumnUpdate;
 +import org.apache.accumulo.proxy.thrift.CompactionReason;
 +import org.apache.accumulo.proxy.thrift.CompactionStrategyConfig;
 +import org.apache.accumulo.proxy.thrift.CompactionType;
 +import org.apache.accumulo.proxy.thrift.Condition;
 +import org.apache.accumulo.proxy.thrift.ConditionalStatus;
 +import 

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

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: eeca25db8ce264293fbeda9c4601e015d8c2baa5
Parents: 9cf9aaa d81ef22
Author: Josh Elser els...@apache.org
Authored: Wed May 13 16:30:37 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 13 16:30:37 2015 -0400

--
 .../accumulo/test/proxy/SimpleProxyBase.java| 1201 +++---
 .../accumulo/test/proxy/TBinaryProxyIT.java |   12 +-
 .../accumulo/test/proxy/TCompactProxyIT.java|   11 +-
 .../test/proxy/TJsonProtocolProxyIT.java|   12 +-
 .../accumulo/test/proxy/TTupleProxyIT.java  |   12 +-
 5 files changed, 746 insertions(+), 502 deletions(-)
--

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

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: dbea79825eb5b8882178cfaa09855b5704e890c4
Parents: eeca25d 25da2e3
Author: Josh Elser els...@apache.org
Authored: Wed May 13 21:06:34 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 13 21:06:34 2015 -0400

--
 .../standalone/StandaloneClusterControl.java| 19 +-
 .../StandaloneClusterControlTest.java   | 38 
 2 files changed, 47 insertions(+), 10 deletions(-)
--

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

[ctubbsii]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 0b7d00db816bb3d6202b89e30ce6a482d2a6b283
Parents: 19b78fe 1ae2325
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue May 12 12:40:44 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue May 12 12:40:44 2015 -0400

--
 DEPENDENCIES | 21 +
 pom.xml  |  9 -
 2 files changed, 21 insertions(+), 9 deletions(-)
--


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

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

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: b30bc3ea29b2717a0b6b10ac0439f5770bc66607
Parents: 0454d9f 8e99ed2
Author: Josh Elser els...@apache.org
Authored: Mon May 11 22:40:12 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon May 11 22:40:12 2015 -0400

--
 CHANGES | 3 +++
 pom.xml | 9 +
 2 files changed, 12 insertions(+)
--


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

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

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 46f76023b93b23f27f55d9ac1833b0f7072609b4
Parents: 8cbaa05 2938cfa
Author: Josh Elser els...@apache.org
Authored: Wed May 6 16:25:34 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed May 6 16:25:34 2015 -0400

--
 .../standalone/StandaloneClusterControl.java|   4 +-
 .../gc/GarbageCollectWriteAheadLogs.java| 146 +++-
 .../gc/GarbageCollectWriteAheadLogsTest.java| 168 +++
 3 files changed, 278 insertions(+), 40 deletions(-)
--

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

[elserj]

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: e25146d0d65ba112ce7008a9f01ec9f850cebd6c
Parents: a03f14a fae7a82
Author: Josh Elser els...@apache.org
Authored: Fri May 1 01:14:41 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Fri May 1 01:14:41 2015 -0400

--
 .../org/apache/accumulo/core/conf/config-header.txt | 9 +
 docs/src/main/asciidoc/chapters/administration.txt  | 7 +++
 .../main/java/org/apache/accumulo/tserver/TabletServer.java | 4 
 .../org/apache/accumulo/tserver/log/TabletServerLogger.java | 8 
 4 files changed, 28 insertions(+)
--