git commit: ACCUMULO-2913 Move timeout annotations to timeout rule with scaling

Repository: accumulo Updated Branches: refs/heads/master aa0cd23be -> a59e22c7c ACCUMULO-2913 Move timeout annotations to timeout rule with scaling Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a59e22c7 Tree: http:

[1/3] git commit: ACCUMULO-3213 Instead of trying to start 100 threads at once, do 16 at a time

Repository: accumulo Updated Branches: refs/heads/1.6 9b3bc30fe -> 76de76075 refs/heads/master e30594a65 -> aa0cd23be ACCUMULO-3213 Instead of trying to start 100 threads at once, do 16 at a time Previously would have been about 50 add splits and 50 delete tables at a time, this brings it ba

[3/3] 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/aa0cd23b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aa0cd23b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aa0cd23b Branch:

[2/3] git commit: ACCUMULO-3213 Instead of trying to start 100 threads at once, do 16 at a time

ACCUMULO-3213 Instead of trying to start 100 threads at once, do 16 at a time Previously would have been about 50 add splits and 50 delete tables at a time, this brings it back to 8 and 8, but leaves the same total number of requests about equal. Project: http://git-wip-us.apache.org/repos/asf/a

[2/3] git commit: ACCUMULO-3212 Do not load defaults into new Configuration objects for CredentialProvider

ACCUMULO-3212 Do not load defaults into new Configuration objects for CredentialProvider Formatter fixed up some non-complaint whitespace too. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b3bc30f Tree: http://git-w

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

Merge branch '1.6' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e30594a6 Tree: http://git-wip-us.apache.org/repos/asf/accumul

[1/3] git commit: ACCUMULO-3212 Do not load defaults into new Configuration objects for CredentialProvider

Repository: accumulo Updated Branches: refs/heads/1.6 4a5bd7ef6 -> 9b3bc30fe refs/heads/master f6b83ee50 -> e30594a65 ACCUMULO-3212 Do not load defaults into new Configuration objects for CredentialProvider Formatter fixed up some non-complaint whitespace too. Project: http://git-wip-us.a