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

Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18725dd6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18725dd6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18725dd6 Branch:

[5/6] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java Projec

[2/6] accumulo git commit: ACCUMULO-3509: Make cleanup stateful to minimize blocking

ACCUMULO-3509: Make cleanup stateful to minimize blocking By enabling state ( true/false) within the cleanup method, the change will avoid blocking on a scan session being swept. if the session cleanup blocks because a ScanSession is still being read, we may block until the ScanBatch returns for

[3/6] accumulo git commit: ACCUMULO-3509: Make cleanup stateful to minimize blocking

ACCUMULO-3509: Make cleanup stateful to minimize blocking By enabling state ( true/false) within the cleanup method, the change will avoid blocking on a scan session being swept. if the session cleanup blocks because a ScanSession is still being read, we may block until the ScanBatch returns for

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

Merge branch '1.6' into 1.7 Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java Projec

[1/6] accumulo git commit: ACCUMULO-3509: Make cleanup stateful to minimize blocking

Repository: accumulo Updated Branches: refs/heads/1.6 567f52fb2 -> 46ad8368e refs/heads/1.7 642add8cc -> 656282825 refs/heads/master 21123cca7 -> 18725dd6c ACCUMULO-3509: Make cleanup stateful to minimize blocking By enabling state ( true/false) within the cleanup method, the change will

[accumulo] Git Push Summary

Repository: accumulo Updated Branches: refs/heads/ACCUMULO-2883 [deleted] 1ae1b34f3

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

Merge branch '1.7' Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21123cca Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/21123cca Diff: http://git-wip-us.apache.org/repos/asf/acc

[1/6] accumulo git commit: ACCUMULO-4106 Update release plugin tagNameFormat

Repository: accumulo Updated Branches: refs/heads/1.6 8669215b1 -> 567f52fb2 refs/heads/1.7 78659a61f -> 642add8cc refs/heads/master 64713554b -> 21123cca7 ACCUMULO-4106 Update release plugin tagNameFormat Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wi

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

Merge branch '1.6' into 1.7 Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/642add8c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/642add8c Diff: http://git-wip-us.apache.org/repo

[2/6] accumulo git commit: ACCUMULO-4106 Update release plugin tagNameFormat

ACCUMULO-4106 Update release plugin tagNameFormat Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/567f52fb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/567f52fb Diff: http://git-wip-us.apache.org/repos/asf/

[5/6] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/642add8c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/642add8c Diff: http://git-wip-us.apache.org/repo

[3/6] accumulo git commit: ACCUMULO-4106 Update release plugin tagNameFormat

ACCUMULO-4106 Update release plugin tagNameFormat Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/567f52fb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/567f52fb Diff: http://git-wip-us.apache.org/repos/asf/

accumulo git commit: ACCUMULO-4095 Hacks on CustomNonBlockingServer to restore client address functionality.

Repository: accumulo Updated Branches: refs/heads/master e7fe96f2a -> 64713554b ACCUMULO-4095 Hacks on CustomNonBlockingServer to restore client address functionality. Closes apache/accumulo#63 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.or