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

2017-08-02 Thread mmiller
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:

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

2017-07-19 Thread mmiller
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/a5ed1ba3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a5ed1ba3 Diff:

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

2017-07-10 Thread mmiller
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:

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

2017-06-22 Thread mmiller
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:

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

2017-06-19 Thread dlmarion
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:

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

2017-05-02 Thread mmiller
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:

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

2017-04-07 Thread kturner
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:

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

2017-03-07 Thread kturner
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:

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

2017-02-02 Thread mjwall
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:

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

2017-01-30 Thread kturner
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:

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

2017-01-26 Thread kturner
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:

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

2017-01-25 Thread dlmarion
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:

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

2017-01-25 Thread kturner
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:

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

2016-12-06 Thread mmiller
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/7c7bbabb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c7bbabb Diff:

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

2016-11-17 Thread mmiller
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/43b740bc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43b740bc Diff:

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

2016-11-07 Thread mmiller
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:

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

2016-05-23 Thread dlmarion
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: