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

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/ac

[1/2] accumulo git commit: ACCUMULO-2806: changed permissions of /accumulo to 700

Repository: accumulo Updated Branches: refs/heads/master 94cdcc4d3 -> cf69e3f67 ACCUMULO-2806: changed permissions of /accumulo to 700 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f02b731a Tree: http://git-wip-us.

accumulo git commit: ACCUMULO-2806: changed permissions of /accumulo to 700

Repository: accumulo Updated Branches: refs/heads/1.8 dba444757 -> f02b731a2 ACCUMULO-2806: changed permissions of /accumulo to 700 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f02b731a Tree: http://git-wip-us.apa

[1/9] accumulo git commit: ACCUMULO-4501 ACCUMULO-96 Added Summarization

Repository: accumulo Updated Branches: refs/heads/master 68ba2ef11 -> 94cdcc4d3 http://git-wip-us.apache.org/repos/asf/accumulo/blob/94cdcc4d/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java -- diff --git

[4/9] accumulo git commit: ACCUMULO-4501 ACCUMULO-96 Added Summarization

http://git-wip-us.apache.org/repos/asf/accumulo/blob/94cdcc4d/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift

[7/9] accumulo git commit: ACCUMULO-4501 ACCUMULO-96 Added Summarization

http://git-wip-us.apache.org/repos/asf/accumulo/blob/94cdcc4d/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummaries.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummaries.java b/core/

[9/9] accumulo git commit: ACCUMULO-4501 ACCUMULO-96 Added Summarization

ACCUMULO-4501 ACCUMULO-96 Added Summarization closes apache/accumulo#224 closes apache/accumulo#168 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/94cdcc4d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/94c

[8/9] accumulo git commit: ACCUMULO-4501 ACCUMULO-96 Added Summarization

http://git-wip-us.apache.org/repos/asf/accumulo/blob/94cdcc4d/core/src/main/java/org/apache/accumulo/core/client/summary/Summarizer.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/client/summary/Summarizer.java b

[2/9] accumulo git commit: ACCUMULO-4501 ACCUMULO-96 Added Summarization

http://git-wip-us.apache.org/repos/asf/accumulo/blob/94cdcc4d/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java -- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver

[3/9] accumulo git commit: ACCUMULO-4501 ACCUMULO-96 Added Summarization

http://git-wip-us.apache.org/repos/asf/accumulo/blob/94cdcc4d/core/src/main/java/org/apache/accumulo/core/util/CancelFlagFuture.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/util/CancelFlagFuture.java b/core/sr

[6/9] accumulo git commit: ACCUMULO-4501 ACCUMULO-96 Added Summarization

http://git-wip-us.apache.org/repos/asf/accumulo/blob/94cdcc4d/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummaryRequest.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummaryRequest.jav

[5/9] accumulo git commit: ACCUMULO-4501 ACCUMULO-96 Added Summarization

http://git-wip-us.apache.org/repos/asf/accumulo/blob/94cdcc4d/core/src/main/java/org/apache/accumulo/core/summary/SummaryCollection.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/summary/SummaryCollection.java b