[2/3] 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/5da9a3af Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5da9a3af Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5da9a3af

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

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

[2/3] 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/0dee0d85 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0dee0d85 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0dee0d85

[2/3] 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/02f24e06 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/02f24e06 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/02f24e06

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

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

Merge branch '1.7' into 1.8 Conflicts: core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/

[2/3] 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/04847d97 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04847d97 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04847d97

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

[2/3] 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/09fcd142 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/09fcd142 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/09fcd142

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

[2/3] 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/8668c7f3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8668c7f3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8668c7f3

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

Merge branch '1.7' into 1.8 Conflicts: server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b903766e Tree: http://git-wip-us.apache.or

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

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

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

Merge branch '1.7' into 1.8 Conflicts: server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1bf8a636 Tree: http://git-wip-us.apache.o

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