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

2017-01-30 Thread kturner
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e62b5066 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e62b5066 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e62b5066 Branch:

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

[1/3] accumulo git commit: ACCUMULO-4578 fixed checkstyle issue

2017-01-30 Thread kturner
Repository: accumulo Updated Branches: refs/heads/master 96827a57e -> e62b5066c ACCUMULO-4578 fixed checkstyle issue Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5f664cd7 Tree: http://git-wip-us.apache.org/repos/a

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

[1/2] accumulo git commit: ACCUMULO-4578 fixed checkstyle issue

2017-01-30 Thread kturner
Repository: accumulo Updated Branches: refs/heads/1.8 1f31ca6c2 -> 09fcd142e ACCUMULO-4578 fixed checkstyle issue Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5f664cd7 Tree: http://git-wip-us.apache.org/repos/asf/

accumulo git commit: ACCUMULO-4578 fixed checkstyle issue

2017-01-30 Thread kturner
Repository: accumulo Updated Branches: refs/heads/1.7 6d8a5fa59 -> 5f664cd76 ACCUMULO-4578 fixed checkstyle issue Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5f664cd7 Tree: http://git-wip-us.apache.org/repos/asf/

[1/3] accumulo git commit: ACCUMULO-4578 release namespace lock when compaction canceled

2017-01-30 Thread kturner
Repository: accumulo Updated Branches: refs/heads/1.8 bf5b6e0fa -> 1f31ca6c2 ACCUMULO-4578 release namespace lock when compaction canceled Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db84650e Tree: http://git-wip

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

2017-01-30 Thread kturner
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/96827a57 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/96827a57 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/96827a57 Branch:

[2/4] accumulo git commit: ACCUMULO-4578 added some javadoc

2017-01-30 Thread kturner
ACCUMULO-4578 added some javadoc Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6d8a5fa5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6d8a5fa5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6d8

[1/4] accumulo git commit: ACCUMULO-4578 release namespace lock when compaction canceled

2017-01-30 Thread kturner
Repository: accumulo Updated Branches: refs/heads/master adb26259e -> 96827a57e ACCUMULO-4578 release namespace lock when compaction canceled Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db84650e Tree: http://git-

[3/3] 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: http:

[2/3] accumulo git commit: ACCUMULO-4578 added some javadoc

2017-01-30 Thread kturner
ACCUMULO-4578 added some javadoc Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6d8a5fa5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6d8a5fa5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6d8

[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: http:

[1/2] accumulo git commit: ACCUMULO-4578 release namespace lock when compaction canceled

2017-01-30 Thread kturner
Repository: accumulo Updated Branches: refs/heads/1.7 7b9a11ad4 -> 6d8a5fa59 ACCUMULO-4578 release namespace lock when compaction canceled Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db84650e Tree: http://git-wip

[2/2] accumulo git commit: ACCUMULO-4578 added some javadoc

2017-01-30 Thread kturner
ACCUMULO-4578 added some javadoc Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6d8a5fa5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6d8a5fa5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6d8