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

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

[2/6] accumulo git commit: [ACCUMULO-4506] Add a timeout to a replication RPC call

[ACCUMULO-4506] Add a timeout to a replication RPC call This addresses an issue where a replication task will get stuck for a substantial amount of time. Using a timeout for the client will abandon the task after 2m (default) for a single RPC attempt. Note that this is related to the

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

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

[1/6] accumulo git commit: [ACCUMULO-4506] Add a timeout to a replication RPC call

Repository: accumulo Updated Branches: refs/heads/1.7 771475ad5 -> 5f6882fc2 refs/heads/1.8 cae07900b -> c093b561d refs/heads/master ac460d0c8 -> 6128f024d [ACCUMULO-4506] Add a timeout to a replication RPC call This addresses an issue where a replication task will get stuck for a

[3/6] accumulo git commit: [ACCUMULO-4506] Add a timeout to a replication RPC call

[ACCUMULO-4506] Add a timeout to a replication RPC call This addresses an issue where a replication task will get stuck for a substantial amount of time. Using a timeout for the client will abandon the task after 2m (default) for a single RPC attempt. Note that this is related to the

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

Merge branch '1.8' ACCUMULO-4506 Closes #254 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6128f024 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6128f024 Diff:

[3/7] accumulo git commit: ACCUMULO-4633: Added check to prevent division by zero

ACCUMULO-4633: Added check to prevent division by zero Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/771475ad Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/771475ad Diff:

[1/7] accumulo git commit: ACCUMULO-4365: Configured ConditionalWriterIT tracer span min to 0

Repository: accumulo Updated Branches: refs/heads/1.8 6e9f1f728 -> cae07900b refs/heads/master f453f4d9c -> ac460d0c8 ACCUMULO-4365: Configured ConditionalWriterIT tracer span min to 0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[5/7] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Conflicts: test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cae07900 Tree:

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

Merge branch '1.7' into 1.8 Conflicts: test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cae07900 Tree:

[2/7] accumulo git commit: ACCUMULO-4365: Configured ConditionalWriterIT tracer span min to 0

ACCUMULO-4365: Configured ConditionalWriterIT tracer span min to 0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b4ed9385 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b4ed9385 Diff:

[4/7] accumulo git commit: ACCUMULO-4633: Added check to prevent division by zero

ACCUMULO-4633: Added check to prevent division by zero Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/771475ad Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/771475ad Diff:

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

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

accumulo git commit: ACCUMULO-4633: Added check to prevent division by zero

Repository: accumulo Updated Branches: refs/heads/1.7 b4ed93854 -> 771475ad5 ACCUMULO-4633: Added check to prevent division by zero Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/771475ad Tree:

[1/2] accumulo git commit: ACCUMULO-4365: Configured ConditionalWriterIT tracer span min to 0

Repository: accumulo Updated Branches: refs/heads/master 5002d162e -> f453f4d9c ACCUMULO-4365: Configured ConditionalWriterIT tracer span min to 0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6e9f1f72 Tree:

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

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

accumulo git commit: ACCUMULO-4365: Configured ConditionalWriterIT tracer span min to 0

Repository: accumulo Updated Branches: refs/heads/1.8 02f24e066 -> 6e9f1f728 ACCUMULO-4365: Configured ConditionalWriterIT tracer span min to 0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6e9f1f72 Tree:

accumulo git commit: ACCUMULO-4365: Configured ConditionalWriterIT tracer span min to 0

Repository: accumulo Updated Branches: refs/heads/1.7 1061fb553 -> b4ed93854 ACCUMULO-4365: Configured ConditionalWriterIT tracer span min to 0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b4ed9385 Tree: