[2/2] accumulo git commit: Merge branch '1.8'

[ibella]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 80762e9fcb25c1772510119d466c3352cec32f82
Parents: 32dbd42 6c20e50
Author: Ivan Bella 
Authored: Wed Jul 19 18:51:17 2017 -0400
Committer: Ivan Bella 
Committed: Wed Jul 19 18:51:17 2017 -0400

--
 .../balancer/HostRegexTableLoadBalancer.java| 117 +--
 .../BaseHostRegexTableLoadBalancerTest.java |  65 ++-
 ...gexTableLoadBalancerReconfigurationTest.java |   2 +-
 .../HostRegexTableLoadBalancerTest.java |  61 --
 4 files changed, 224 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/80762e9f/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
--
diff --cc 
server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
index 945efd0,dbf03d0..c3d15c8
--- 
a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
@@@ -31,16 -32,19 +32,20 @@@ import java.util.SortedMap
  import java.util.TreeMap;
  import java.util.regex.Pattern;
  
+ import com.google.common.collect.HashMultimap;
+ import com.google.common.collect.Iterables;
+ import com.google.common.collect.Multimap;
  import org.apache.accumulo.core.client.admin.TableOperations;
 -import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.client.impl.Table;
  import org.apache.accumulo.core.conf.ConfigurationObserver;
 +import org.apache.accumulo.core.conf.ConfigurationTypeHelper;
  import org.apache.accumulo.core.conf.Property;
  import org.apache.accumulo.core.data.impl.KeyExtent;
+ import org.apache.accumulo.core.master.thrift.TableInfo;
  import org.apache.accumulo.core.master.thrift.TabletServerStatus;
  import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
 +import org.apache.accumulo.server.AccumuloServerContext;
  import org.apache.accumulo.server.conf.ServerConfiguration;
 -import org.apache.accumulo.server.conf.ServerConfigurationFactory;
  import org.apache.accumulo.server.master.state.TServerInstance;
  import org.apache.accumulo.server.master.state.TabletMigration;
  import org.apache.commons.lang.builder.ToStringBuilder;
@@@ -77,15 -88,24 +84,24 @@@ public class HostRegexTableLoadBalance
+ "balancer.host.regex.concurrent.migrations";
private static final int HOST_BALANCER_REGEX_MAX_MIGRATIONS_DEFAULT = 250;
protected static final String DEFAULT_POOL = "HostTableLoadBalancer.ALL";
+   private static final int DEFAULT_OUTSTANDING_MIGRATIONS = 0;
+   public static final String HOST_BALANCER_OUTSTANDING_MIGRATIONS_KEY = 
Property.TABLE_ARBITRARY_PROP_PREFIX.getKey()
+   + "balancer.host.regex.max.outstanding.migrations";
  
 -  protected long oobCheckMillis = 
AccumuloConfiguration.getTimeInMillis(HOST_BALANCER_OOB_DEFAULT);
 +  protected long oobCheckMillis = 
ConfigurationTypeHelper.getTimeInMillis(HOST_BALANCER_OOB_DEFAULT);
  
+   private static final long ONE_HOUR = 60 * 60 * 1000;
 -  private static final Set EMPTY_MIGRATIONS = 
Collections.EMPTY_SET;
++  private static final Set EMPTY_MIGRATIONS = 
Collections.emptySet();
+ 
 -  private Map tableIdToTableName = null;
 +  private Map tableIdToTableName = null;
private Map poolNameToRegexPattern = null;
private volatile long lastOOBCheck = System.currentTimeMillis();
-   private boolean isIpBasedRegex = false;
+   private volatile boolean isIpBasedRegex = false;
private Map> pools = 
new HashMap<>();
-   private int maxTServerMigrations = 
HOST_BALANCER_REGEX_MAX_MIGRATIONS_DEFAULT;
+   private volatile int maxTServerMigrations = 
HOST_BALANCER_REGEX_MAX_MIGRATIONS_DEFAULT;
+   private volatile int maxOutstandingMigrations = 
DEFAULT_OUTSTANDING_MIGRATIONS;
 -  private final Map migrationsFromLastPass = new 
HashMap();
 -  private final Map tableToTimeSinceNoMigrations = new 
HashMap();
++  private final Map migrationsFromLastPass = new 
HashMap<>();
++  private final Map tableToTimeSinceNoMigrations = new 
HashMap<>();
  
/**
 * Group the set of current tservers by pool name. Tservers that don't 
match a regex are 

[2/2] accumulo git commit: Merge branch '1.8'

[mjwall]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: c76b4dd3b654a568c173013265dfea4729964a7b
Parents: 275e91b 5194ae7
Author: Michael Wall 
Authored: Tue Jun 20 14:55:57 2017 -0400
Committer: Michael Wall 
Committed: Tue Jun 20 14:55:57 2017 -0400

--
 .../apache/accumulo/core/file/rfile/RFile.java  | 60 +++-
 1 file changed, 20 insertions(+), 40 deletions(-)
--


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

[2/2] accumulo git commit: Merge branch '1.8'

[mmiller]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: f453f4d9ce1f945e1aae4301c15fb76fd088be84
Parents: 5002d16 6e9f1f7
Author: Mike Miller 
Authored: Wed May 3 14:09:38 2017 -0400
Committer: Mike Miller 
Committed: Wed May 3 14:09:38 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f453f4d9/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
index 7df5885,9ebb2bd..b642de8
--- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@@ -87,9 -88,10 +88,10 @@@ import org.apache.accumulo.core.trace.D
  import org.apache.accumulo.core.trace.Span;
  import org.apache.accumulo.core.trace.Trace;
  import org.apache.accumulo.core.util.FastFormat;
 -import org.apache.accumulo.examples.simple.constraints.AlphaNumKeyConstraint;
 +import org.apache.accumulo.test.constraints.AlphaNumKeyConstraint;
  import org.apache.accumulo.harness.AccumuloClusterHarness;
  import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
+ import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
  import org.apache.accumulo.test.functional.BadIterator;
  import org.apache.accumulo.test.functional.SlowIterator;
  import org.apache.accumulo.tracer.TraceDump;

[2/2] accumulo git commit: Merge branch '1.8'

[mmiller]

Merge branch '1.8'

 Conflicts:

server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java


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

Branch: refs/heads/master
Commit: cf69e3f675b8b3445a0e01de4331f0fd16e1e43f
Parents: 94cdcc4 f02b731
Author: Mike Miller 
Authored: Mon Mar 20 13:58:34 2017 -0400
Committer: Mike Miller 
Committed: Mon Mar 20 13:58:34 2017 -0400

--
 .../main/java/org/apache/accumulo/server/fs/VolumeManager.java  | 4 
 .../java/org/apache/accumulo/server/fs/VolumeManagerImpl.java   | 5 +
 .../main/java/org/apache/accumulo/server/init/Initialize.java   | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cf69e3f6/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java
--
diff --cc 
server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java
index 09436a5,69f883f..06ece48
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java
@@@ -28,6 -27,9 +28,7 @@@ import org.apache.hadoop.fs.FSDataInput
  import org.apache.hadoop.fs.FSDataOutputStream;
  import org.apache.hadoop.fs.FileStatus;
  import org.apache.hadoop.fs.Path;
 -
 -import com.google.common.base.Optional;
+ import org.apache.hadoop.fs.permission.FsPermission;
  
  /**
   * A wrapper around multiple hadoop FileSystem objects, which are assumed to 
be different volumes. This also concentrates a bunch of meta-operations like

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cf69e3f6/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
--

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

[2/2] accumulo git commit: Merge branch '1.8'

[mjwall]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 1e000359f25470b8c97ff32c5c4f732dfa338636
Parents: 62bbce4 a4ef3e0
Author: Michael Wall 
Authored: Thu Feb 9 14:46:35 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 14:46:35 2017 -0500

--
 .../main/asciidoc/chapters/administration.txt   | 37 
 1 file changed, 14 insertions(+), 23 deletions(-)
--


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

[2/2] accumulo git commit: Merge branch '1.8'

[kturner]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 3c57b662f6dea71e03321bbd2d7654038ff9f501
Parents: 6d8f411 95be9f3
Author: Keith Turner 
Authored: Tue Jan 24 12:12:31 2017 -0500
Committer: Keith Turner 
Committed: Tue Jan 24 12:12:31 2017 -0500

--
 .../ConfigurableCompactionStrategy.java | 64 
 1 file changed, 52 insertions(+), 12 deletions(-)
--

[2/2] accumulo git commit: Merge branch '1.8'

[drew]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 016ea678033076e34d66f8c0d5a3c1990f8b3df8
Parents: 551fa09 83fe980
Author: Drew Farris 
Authored: Tue Oct 11 20:42:28 2016 -0400
Committer: Drew Farris 
Committed: Tue Oct 11 20:42:28 2016 -0400

--
 .../accumulo/tserver/InMemoryMapTest.java   | 26 
 1 file changed, 26 insertions(+)
--

[2/2] accumulo git commit: Merge branch '1.8'

[ctubbsii]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 551fa0954f37185e61d4a59e1a59f0cbebc15f4a
Parents: c7aed83 69ca25f
Author: Christopher Tubbs 
Authored: Tue Oct 11 20:22:30 2016 -0400
Committer: Christopher Tubbs 
Committed: Tue Oct 11 20:22:30 2016 -0400

--
 .../apache/accumulo/tserver/MemValueTest.java   | 35 
 1 file changed, 35 insertions(+)
--

[2/2] accumulo git commit: Merge branch '1.8'

[dlmarion]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 1c218de97e93f9b9dbadac987b3e3ef80c448cdf
Parents: eac5f89 f7989c6
Author: Dave Marion 
Authored: Tue Oct 4 14:42:48 2016 -0400
Committer: Dave Marion 
Committed: Tue Oct 4 14:42:48 2016 -0400

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

[2/2] accumulo git commit: Merge branch '1.8'

[kturner]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 5df9bc16f5df2f0e050e1049821c49029ed6bc25
Parents: ad98547 d074eff
Author: Keith Turner 
Authored: Fri Jul 22 11:53:51 2016 -0400
Committer: Keith Turner 
Committed: Fri Jul 22 11:53:51 2016 -0400

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

[2/2] accumulo git commit: Merge branch '1.8'

[dlmarion]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 2b5b54bec3de245b3e895ee8ffafeb141f77df46
Parents: c521cf8 08d279f
Author: Dave Marion 
Authored: Tue Jun 14 14:21:02 2016 -0400
Committer: Dave Marion 
Committed: Tue Jun 14 14:21:02 2016 -0400

--
 .../java/org/apache/accumulo/core/conf/PropertyType.java | 11 ---
 .../accumulo/core/conf/AccumuloConfigurationTest.java|  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b5b54be/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
--

[2/2] accumulo git commit: Merge branch '1.8'

[dlmarion]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: c521cf810b8e38ba90dcd75a3b9b27f45e829bd3
Parents: af91fbd 7f8f66d
Author: Dave Marion 
Authored: Tue Jun 14 11:04:38 2016 -0400
Committer: Dave Marion 
Committed: Tue Jun 14 11:04:38 2016 -0400

--
 .../core/conf/AccumuloConfiguration.java|  36 ++-
 .../apache/accumulo/core/conf/PropertyType.java |  58 -
 .../core/conf/AccumuloConfigurationTest.java|  75 ++
 .../main/asciidoc/chapters/administration.txt   |   5 +-
 .../java/org/apache/accumulo/proxy/Proxy.java   |   4 +-
 .../org/apache/accumulo/server/Accumulo.java|   4 +-
 .../accumulo/server/monitor/LogService.java |   2 +-
 .../accumulo/server/rpc/TServerUtils.java   | 154 ++-
 .../org/apache/accumulo/server/util/Admin.java  |  20 +-
 .../accumulo/server/util/TServerUtilsTest.java  | 261 +++
 .../accumulo/gc/SimpleGarbageCollector.java |  13 +-
 .../java/org/apache/accumulo/master/Master.java |   2 +-
 .../accumulo/monitor/EmbeddedWebServer.java |   4 +
 .../org/apache/accumulo/monitor/Monitor.java|  65 ++---
 .../org/apache/accumulo/tracer/TraceServer.java |  21 +-
 .../accumulo/test/functional/ZombieTServer.java |   4 +-
 .../test/performance/thrift/NullTserver.java|   6 +-
 17 files changed, 595 insertions(+), 139 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c521cf81/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
--
diff --cc core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index bd80700,f08ab5b..5cba0be
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@@ -25,8 -24,16 +25,11 @@@ import java.util.regex.Matcher
  import java.util.regex.Pattern;
  
  import org.apache.accumulo.core.Constants;
+ import org.apache.accumulo.core.util.Pair;
  import org.apache.hadoop.fs.Path;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
  
 -import com.google.common.base.Function;
 -import com.google.common.base.Predicate;
 -import com.google.common.base.Predicates;
 -import com.google.common.collect.Collections2;
 -
  /**
   * Types of {@link Property} values. Each type has a short name, a 
description, and a regex which valid values match. All of these fields are 
optional.
   */
@@@ -52,8 -59,10 +55,10 @@@ public enum PropertyType 
+ "Examples of valid host lists are 
'localhost:2000,www.example.com,10.10.1.1:500' and 'localhost'.\n"
+ "Examples of invalid host lists are '', ':1000', and 
'localhost:8'"),
  
-   PORT("port", new Bounds(1024, 65535).or(in(true, "0")),
-   "An positive integer in the range 1024-65535, not already in use or 
specified elsewhere in the configuration"),
+   @SuppressWarnings("unchecked")
 -  PORT("port", Predicates.or(new Bounds(1024, 65535), in(true, "0"), new 
PortRange("\\d{4,5}-\\d{4,5}")),
++  PORT("port", or(new Bounds(1024, 65535), in(true, "0"), new 
PortRange("\\d{4,5}-\\d{4,5}")),
+   "An positive integer in the range 1024-65535 (not already in use or 
specified elsewhere in the configuration),\n"
+   + "zero to indicate any open ephemeral port, or a range of positive 
integers specified as M-N"),
  
COUNT("count", new Bounds(0, Integer.MAX_VALUE), "A non-negative integer in 
the range of 0-" + Integer.MAX_VALUE),
  
@@@ -113,15 -126,21 +118,20 @@@
 * @return true if value is valid or null, or if this type has no regex
 */
public boolean isValidFormat(String value) {
 -return predicate.apply(value);
 +return predicate.test(value);
 +  }
 +
++  @SuppressWarnings("unchecked")
++  private static Predicate or(final Predicate... others) {
++return (x) -> Arrays.stream(others).anyMatch(y -> y.test(x));
+   }
+ 
 -  private static Predicate in(final boolean caseSensitive, final 
String... strings) {
 -List allowedSet = Arrays.asList(strings);
 +  private static Predicate in(final boolean caseSensitive, final 
String... allowedSet) {
  if (caseSensitive) {
 -  return Predicates.in(allowedSet);
 +  return x -> Arrays.stream(allowedSet).anyMatch(y -> (x == null && y == 
null) || (x != null && x.equals(y)));
  } else {
 -  

[2/2] accumulo git commit: Merge branch '1.8'

[dlmarion]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 4e9e01f4ced856eac61cfdaf8d68304af509ea4e
Parents: 64547ab a98dbec
Author: Dave Marion 
Authored: Mon Jun 13 11:44:38 2016 -0400
Committer: Dave Marion 
Committed: Mon Jun 13 11:44:38 2016 -0400

--
 assemble/bin/bootstrap_hdfs.sh | 21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)
--

[2/2] accumulo git commit: Merge branch '1.8'

[dlmarion]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 35ab8cef050ab870207711d8186e591d982e3d14
Parents: f7481b4 60591c8
Author: Dave Marion 
Authored: Wed Jun 8 08:22:23 2016 -0400
Committer: Dave Marion 
Committed: Wed Jun 8 08:22:23 2016 -0400

--
 assemble/bin/accumulo   | 15 -
 assemble/bin/config.sh  | 14 
 assemble/bin/start-daemon.sh| 71 +++-
 assemble/bin/stop-server.sh | 25 ---
 assemble/conf/templates/accumulo-env.sh | 12 
 assemble/conf/templates/generic_logger.xml  |  4 +-
 .../main/asciidoc/chapters/administration.txt   | 49 ++
 7 files changed, 130 insertions(+), 60 deletions(-)
--

[2/2] accumulo git commit: Merge branch '1.8'

[kturner]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: f7481b4ce37f6af7e616da4089638fffdea2d4e2
Parents: 35de952 7b8a11b
Author: Keith Turner 
Authored: Fri Jun 3 11:33:58 2016 -0400
Committer: Keith Turner 
Committed: Fri Jun 3 11:33:58 2016 -0400

--
 .../org/apache/accumulo/core/data/Value.java| 26 
 .../apache/accumulo/core/data/ValueTest.java| 25 +++
 2 files changed, 51 insertions(+)
--

[2/2] accumulo git commit: Merge branch '1.8'

[dlmarion]

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: e2856a4da8b490b320b7155287866e2089ca9203
Parents: a6ecb7a 443f220
Author: Dave Marion 
Authored: Tue May 10 16:35:16 2016 -0400
Committer: Dave Marion 
Committed: Tue May 10 16:35:16 2016 -0400

--
 start/pom.xml   |  63 +--
 .../test/resources/ClassLoaderTestA/Test.jar| Bin 761 -> 0 bytes
 .../test/resources/ClassLoaderTestB/Test.jar| Bin 761 -> 0 bytes
 .../test/resources/ClassLoaderTestC/Test.jar| Bin 760 -> 0 bytes
 start/src/test/resources/HelloWorld.jar | Bin 692 -> 0 bytes
 start/src/test/resources/HelloWorld2.jar| Bin 692 -> 0 bytes
 start/src/test/shell/makeHelloWorldJars.sh  |  16 ++---
 start/src/test/shell/makeTestJars.sh|   9 ++-
 8 files changed, 40 insertions(+), 48 deletions(-)
--


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