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

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

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

2017-01-30 Thread kturner
Merge branch '1.7' into 1.8 Conflicts: test/src/main/java/org/apache/accumulo/test/functional/ConcurrentDeleteTableIT.java test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

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

2016-10-11 Thread edcoleman
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/739577d1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/739577d1 Diff:

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

2016-08-26 Thread busbey
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/e68b8dbc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e68b8dbc Diff:

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

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

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

2016-06-14 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/24289e2c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24289e2c Diff:

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

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

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

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