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

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

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2e4f3209 Tree: http://git-wip-us.apa

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

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

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

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

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

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

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

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ff083364 Tree: http://git-wip-us.apache.org/r

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

Merge branch '1.6' into 1.7 Conflicts: assemble/bin/start-server.sh Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a25ec8ec Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a25ec8ec Diff: http://git-w

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

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

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

[2/2] 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/2] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f50db38f Tree: http://git-wip-us.apache.org/repos/asf/ac

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

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

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

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

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

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

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

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

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java core/src/test/java/org/apache/accumulo/core/client/ClientConfigurationTest.java shell