[06/25] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java

[15/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

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

[08/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java -- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java

[20/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

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

[09/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java -- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java

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

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

[10/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

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

[03/25] accumulo git commit: ACCUMULO-3759 More Java 8 compiler warnings

ACCUMULO-3759 More Java 8 compiler warnings * Fix compiler warnings in Java 8 for 1.5 branch Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e395bc8c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e395bc8c

[07/25] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java

[19/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java -- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java

[01/25] accumulo git commit: ACCUMULO-3759 More Java 8 compiler warnings

Repository: accumulo Updated Branches: refs/heads/1.5 5ac1b52ef - e395bc8ce refs/heads/1.6 67c8b2b67 - bbcc6da44 refs/heads/1.7 ef2e31af3 - 4d1acd14a refs/heads/master ae4fd486d - a03f14a5c ACCUMULO-3759 More Java 8 compiler warnings * Fix compiler warnings in Java 8 for 1.5 branch

[14/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java -- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java

[11/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java

[04/25] accumulo git commit: ACCUMULO-3759 More Java 8 compiler warnings

ACCUMULO-3759 More Java 8 compiler warnings * Fix compiler warnings in Java 8 for 1.5 branch Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e395bc8c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e395bc8c

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

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java core/src/main/scripts/generate-thrift.sh core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java pom.xml

[16/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java

[13/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java -- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java

[17/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

ACCUMULO-3759 More build warnings on Java 8 * Clean up build output while generating example configs * Fix javac warnings from thrift * Enable specifying different findbugs version to build on jdk8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[22/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

ACCUMULO-3759 More build warnings on Java 8 * Clean up build output while generating example configs * Fix javac warnings from thrift * Enable specifying different findbugs version to build on jdk8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[18/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java -- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java

[02/25] accumulo git commit: ACCUMULO-3759 More Java 8 compiler warnings

ACCUMULO-3759 More Java 8 compiler warnings * Fix compiler warnings in Java 8 for 1.5 branch Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e395bc8c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e395bc8c

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

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java core/src/main/scripts/generate-thrift.sh core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java pom.xml

[3/5] accumulo git commit: ACCUMULO-3124 Document size and number of user-provided properties

ACCUMULO-3124 Document size and number of user-provided properties Include warnings for both custom tags and iterator options Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fae7a822 Tree:

[2/5] accumulo git commit: ACCUMULO-3767 current log might be null

ACCUMULO-3767 current log might be null A server might not have a current log. Account for that, specifically for getActiveLogs(). Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2b48d1cc Tree:

[1/5] accumulo git commit: ACCUMULO-3767 current log might be null

Repository: accumulo Updated Branches: refs/heads/1.7 4d1acd14a - fae7a8224 refs/heads/master a03f14a5c - e25146d0d ACCUMULO-3767 current log might be null A server might not have a current log. Account for that, specifically for getActiveLogs(). Project:

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

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

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

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

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

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

[1/3] accumulo git commit: ACCUMULO-3762: Add case for ephemeral nodes

Repository: accumulo Updated Branches: refs/heads/master bcc79d006 - ae4fd486d ACCUMULO-3762: Add case for ephemeral nodes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67c8b2b6 Tree: