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

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

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

Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8aaef9e7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8aaef9e7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8aaef9e7

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

Merge branch '1.6' into 1.7 Adds commit for ACCUMULO-4157 to fix bug where WALs were deleted too quickly for "Dead" Tservers Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5f02d564 Tree: http://git-wip-us.apache.org/re

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

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

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

Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5b1db01d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5b1db01d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5b1db01d

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

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

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java index b7637a6,d32b

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

Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/713282a0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/713282a0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/713282a0

[2/4] accumulo git commit: Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6

Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a922ed79 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a922ed79 Diff: http://gi

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6df97b89/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java -- diff --cc shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java index

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