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

[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' 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/83816af4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/83816af4 Diff: http://gi

[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

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

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

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

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

Merge branch '1.6' Conflicts: LICENSE NOTICE Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63544e84 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63544e84 Diff: http://git-wip-us.apache.or

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

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

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

Merge branch '1.6' Conflicts: docs/src/main/latex/accumulo_user_manual/chapters/administration.tex server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/a

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

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

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

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

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

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

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

[2/2] accumulo git commit: Merge branch '1.6' for ACCUMULO-1722

Merge branch '1.6' for ACCUMULO-1722 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/692312b5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/692312b5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff