[2/8] git commit: ACCUMULO-3135 Fix javadoc misuse of link

ACCUMULO-3135 Fix javadoc misuse of link Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8b17144e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8b17144e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/

[1/8] git commit: ACCUMULO-3135 Fix javadoc misuse of link

Repository: accumulo Updated Branches: refs/heads/1.5 5f2d3473e -> 8b17144e3 refs/heads/1.6 8d316a387 -> d3586ea0d refs/heads/master 2cac013a4 -> 43ef53ed3 ACCUMULO-3135 Fix javadoc misuse of link Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apac

[4/8] git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/beebb946 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/beebb946 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/beebb946

[8/8] git commit: Merge branch '1.6'

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

[7/8] git commit: ACCUMULO-3190 Fix deprecation warning

ACCUMULO-3190 Fix deprecation warning Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3586ea0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3586ea0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/dif

[5/8] git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/beebb946 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/beebb946 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/beebb946

[6/8] git commit: ACCUMULO-3190 Fix deprecation warning

ACCUMULO-3190 Fix deprecation warning Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3586ea0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3586ea0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/dif

[3/8] git commit: ACCUMULO-3135 Fix javadoc misuse of link

ACCUMULO-3135 Fix javadoc misuse of link Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8b17144e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8b17144e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/

[1/3] git commit: ACCUMULO-3187 Up the default memory for MAC for ExamplesIT

Repository: accumulo Updated Branches: refs/heads/1.6 43850055c -> 8d316a387 refs/heads/master c2bdaf292 -> 2cac013a4 ACCUMULO-3187 Up the default memory for MAC for ExamplesIT Was seeing some OOMEs. Give the JVM a little more headroom. Project: http://git-wip-us.apache.org/repos/asf/accum

[2/3] git commit: ACCUMULO-3187 Up the default memory for MAC for ExamplesIT

ACCUMULO-3187 Up the default memory for MAC for ExamplesIT Was seeing some OOMEs. Give the JVM a little more headroom. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8d316a38 Tree: http://git-wip-us.apache.org/repos/as

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

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

[2/6] git commit: ACCUMULO-3085 Fix log message

ACCUMULO-3085 Fix log message Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5f2d3473 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5f2d3473 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5f2d34

[4/6] git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43850055 Tree: http://git-wip-us.apache.org/repos/asf/a

[5/6] git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43850055 Tree: http://git-wip-us.apache.org/repos/asf/a

[1/6] git commit: ACCUMULO-3085 Fix log message

Repository: accumulo Updated Branches: refs/heads/1.5 5459950dd -> 5f2d3473e refs/heads/1.6 6f029b0e9 -> 43850055c refs/heads/master 377105a05 -> c2bdaf292 ACCUMULO-3085 Fix log message Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repo

[3/6] git commit: ACCUMULO-3085 Fix log message

ACCUMULO-3085 Fix log message Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5f2d3473 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5f2d3473 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5f2d34

[6/6] git commit: Merge branch '1.6'

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