[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/58486719 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/58486719 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/591ba9f9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/591ba9f9 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0ee13f25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0ee13f25 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67f5e95d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67f5e95d Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a205559d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a205559d Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3f01418e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3f01418e Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6b139768 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6b139768 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/15055b49 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/15055b49 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a351610e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a351610e Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2b72e7c9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2b72e7c9 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3a005113 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3a005113 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/da695f60 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da695f60 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c093b561 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c093b561 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bca75d35 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bca75d35 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f13792e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f13792e Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8d6b7299 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8d6b7299 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3430da2d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3430da2d Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2a0375ad Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2a0375ad Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Conflicts: shell/src/main/java/org/apache/accumulo/shell/commands/GrepCommand.java shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/da47fb21 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da47fb21 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5a11a021 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a11a021 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Conflicts: server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/037c1384 Tree:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c7431092 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c7431092 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9c11f72e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9c11f72e Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f8fbf32b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f8fbf32b Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91269bf3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91269bf3 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/272ac288 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/272ac288 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2270beea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2270beea Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5a8669a4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a8669a4 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a2ac4dd0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a2ac4dd0 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/38606a86 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/38606a86 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/33f73016 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/33f73016 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5df4f038 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5df4f038 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8c85c32a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8c85c32a Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ba0f0d45 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ba0f0d45 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3401dd8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3401dd8 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4bc75b11 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4bc75b11 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8c3094f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8c3094f6 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2a373da9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2a373da9 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Conflicts: assemble/pom.xml test/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6cc07fa6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6cc07fa6 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61e28dcb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61e28dcb Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24deb392 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24deb392 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c4ad866 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c4ad866 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Conflicts: README.md Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e8118511 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e8118511 Diff:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9dec120e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9dec120e Diff: