[3/6] git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: server/base/src/main/java/org/apache/accumulo/server/Accumulo.java server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java server/master/src/main/java/org/apache/accumulo/master/Master.java server/monitor/src/main/ja

[2/6] git commit: ACCUMULO-3258 Make the dfs.datanode.synconclose check only fire once and ensure logging is properly set up.

ACCUMULO-3258 Make the dfs.datanode.synconclose check only fire once and ensure logging is properly set up. Fixed up some initialization code so that logging is actually one of the first things that happens so log messages aren't thrown into the .out files (as was normally the case). Project:

[4/6] git commit: ACCUMULO-3258 Consolidate "tserver" into application variable

ACCUMULO-3258 Consolidate "tserver" into application variable Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5cb976b3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5cb976b3 Diff: http://git-wip-us.apache.or

[1/6] git commit: ACCUMULO-3258 Make the dfs.datanode.synconclose check only fire once and ensure logging is properly set up.

Repository: accumulo Updated Branches: refs/heads/1.6 1635ad5c7 -> 5cb976b3c refs/heads/master ebe6eecc7 -> 59333e3cb ACCUMULO-3258 Make the dfs.datanode.synconclose check only fire once and ensure logging is properly set up. Fixed up some initialization code so that logging is actually one

[6/6] git commit: Merge branch '1.6'

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

[5/6] git commit: ACCUMULO-3258 Consolidate "tserver" into application variable

ACCUMULO-3258 Consolidate "tserver" into application variable Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5cb976b3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5cb976b3 Diff: http://git-wip-us.apache.or

[6/7] git commit: ACCUMULO-3259 Be a little smarter in Bulk.xml to let the backlog of tasks work itself down before adding more.

ACCUMULO-3259 Be a little smarter in Bulk.xml to let the backlog of tasks work itself down before adding more. If the queue size on the threadpool is greater than 50 times the number of tservers, wait 30 seconds before adding more tasks. This should still ensure that we can keep Accumulo sufficie

[5/7] git commit: ACCUMULO-3257 Include the actual Node's name in log message.

ACCUMULO-3257 Include the actual Node's name in log message. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1635ad5c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1635ad5c Diff: http://git-wip-us.apache.org

[4/7] git commit: ACCUMULO-3257 Include the actual Node's name in log message.

ACCUMULO-3257 Include the actual Node's name in log message. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1635ad5c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1635ad5c Diff: http://git-wip-us.apache.org

[1/7] git commit: ACCUMULO-3257 Use a threadpool to ensure that a Node doesn't exceed maxSec.

Repository: accumulo Updated Branches: refs/heads/1.6 e3a743cb4 -> 1635ad5c7 refs/heads/master eaaebdf33 -> ebe6eecc7 ACCUMULO-3257 Use a threadpool to ensure that a Node doesn't exceed maxSec. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.or

[7/7] git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkTest.java Project: http://git-w

[3/7] git commit: ACCUMULO-3259 Be a little smarter in Bulk.xml to let the backlog of tasks work itself down before adding more.

ACCUMULO-3259 Be a little smarter in Bulk.xml to let the backlog of tasks work itself down before adding more. If the queue size on the threadpool is greater than 50 times the number of tservers, wait 30 seconds before adding more tasks. This should still ensure that we can keep Accumulo sufficie

[2/7] git commit: ACCUMULO-3257 Use a threadpool to ensure that a Node doesn't exceed maxSec.

ACCUMULO-3257 Use a threadpool to ensure that a Node doesn't exceed maxSec. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c4f3fc83 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c4f3fc83 Diff: http://git-wi