[5/7] accumulo git commit: Merge branch '1.5' into 1.6

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

[2/7] accumulo git commit: ACCUMULO-3451 Add more checkstyle checks

ACCUMULO-3451 Add more checkstyle checks Check for unused imports and bad @see javadoc annotations (those which incorrectly use @link also) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/87eec6fc Tree: http://git-wip-u

[7/7] accumulo git commit: ACCUMULO-3458 Remove unused import

ACCUMULO-3458 Remove unused import Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c433364 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c433364 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6

[4/7] accumulo git commit: Merge branch '1.5' into 1.6

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

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

[1/7] accumulo git commit: ACCUMULO-3451 Add more checkstyle checks

Repository: accumulo Updated Branches: refs/heads/1.5 7651b7772 -> 87eec6fcb refs/heads/1.6 dc585068b -> d26f63fda refs/heads/master cd1190995 -> 6c433364f ACCUMULO-3451 Add more checkstyle checks Check for unused imports and bad @see javadoc annotations (those which incorrectly use @link

[3/7] accumulo git commit: ACCUMULO-3451 Add more checkstyle checks

ACCUMULO-3451 Add more checkstyle checks Check for unused imports and bad @see javadoc annotations (those which incorrectly use @link also) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/87eec6fc Tree: http://git-wip-u

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

Merge branch '1.6' Conflicts: docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cd119099 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree

[1/3] accumulo git commit: ACCUMULO-3476 Initial user manual entries for SSL

Repository: accumulo Updated Branches: refs/heads/1.6 410e6a2de -> dc585068b refs/heads/master 23ce1c7ed -> cd1190995 ACCUMULO-3476 Initial user manual entries for SSL Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commi

[2/3] accumulo git commit: ACCUMULO-3476 Initial user manual entries for SSL

ACCUMULO-3476 Initial user manual entries for SSL Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc585068 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc585068 Diff: http://git-wip-us.apache.org/repos/asf/

[1/6] accumulo git commit: ACCUMULO-3475 Remove configError and use config(String...) retval

Repository: accumulo Updated Branches: refs/heads/1.5 cfb832a1f -> 7651b7772 refs/heads/1.6 c6e771e9d -> 410e6a2de refs/heads/master cb288713f -> 23ce1c7ed ACCUMULO-3475 Remove configError and use config(String...) retval The return value of config(String...) is ignored, using the configEr

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

[4/6] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java core/src/test/java/org/apache/accumulo/core/util/shell/commands/FormatterCommandTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip

[3/6] accumulo git commit: ACCUMULO-3475 Remove configError and use config(String...) retval

ACCUMULO-3475 Remove configError and use config(String...) retval The return value of config(String...) is ignored, using the configError member instead. We can get rid of that member and use the retval instead to denote the same thing. Project: http://git-wip-us.apache.org/repos/asf/accumulo/re

[2/6] accumulo git commit: ACCUMULO-3475 Remove configError and use config(String...) retval

ACCUMULO-3475 Remove configError and use config(String...) retval The return value of config(String...) is ignored, using the configError member instead. We can get rid of that member and use the retval instead to denote the same thing. Project: http://git-wip-us.apache.org/repos/asf/accumulo/re

[5/6] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java core/src/test/java/org/apache/accumulo/core/util/shell/commands/FormatterCommandTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip

[1/3] accumulo git commit: ACCUMULO-3474 Fix bad merge.

Repository: accumulo Updated Branches: refs/heads/1.6 ae6de85c9 -> c6e771e9d refs/heads/master 88499ac3d -> cb288713f ACCUMULO-3474 Fix bad merge. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c6e771e9 Tree: http

[2/3] accumulo git commit: ACCUMULO-3474 Fix bad merge.

ACCUMULO-3474 Fix bad merge. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c6e771e9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c6e771e9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c6e771e

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

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

[2/3] accumulo git commit: ACCUMULO-3474 use the value of the delete flag (with test)

ACCUMULO-3474 use the value of the delete flag (with test) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae6de85c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ae6de85c Diff: http://git-wip-us.apache.org/r

[1/3] accumulo git commit: ACCUMULO-3474 use the value of the delete flag (with test)

Repository: accumulo Updated Branches: refs/heads/master 299e06d73 -> 88499ac3d ACCUMULO-3474 use the value of the delete flag (with test) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cfb832a1 Tree: http://git-wip

[2/2] accumulo git commit: ACCUMULO-3474 use the value of the delete flag (with test)

ACCUMULO-3474 use the value of the delete flag (with test) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae6de85c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ae6de85c Diff: http://git-wip-us.apache.org/r

[1/2] accumulo git commit: ACCUMULO-3474 use the value of the delete flag (with test)

Repository: accumulo Updated Branches: refs/heads/1.6 2ca91038c -> ae6de85c9 ACCUMULO-3474 use the value of the delete flag (with test) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cfb832a1 Tree: http://git-wip-us

accumulo git commit: ACCUMULO-3474 use the value of the delete flag (with test)

Repository: accumulo Updated Branches: refs/heads/1.5 19cd20998 -> cfb832a1f ACCUMULO-3474 use the value of the delete flag (with test) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cfb832a1 Tree: http://git-wip-us

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

[1/3] accumulo git commit: ACCUMULO-3472 Avoid filesystem.equals as it isn't implemented

Repository: accumulo Updated Branches: refs/heads/1.6 99011d323 -> 2ca91038c refs/heads/master a542e45c2 -> 299e06d73 ACCUMULO-3472 Avoid filesystem.equals as it isn't implemented The equals method on FileSystem isn't implemented (at least for DistributedFileSystem) which means that VolumeIm

[2/3] accumulo git commit: ACCUMULO-3472 Avoid filesystem.equals as it isn't implemented

ACCUMULO-3472 Avoid filesystem.equals as it isn't implemented The equals method on FileSystem isn't implemented (at least for DistributedFileSystem) which means that VolumeImpl doesn't work as intended and always falls back to the default volume. Use the filesystem's URI and add some tests. Proj