[10/12] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: test/system/bench/cloudstone1/cloudstone1.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2efeb52f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2efeb52f Di

[02/12] accumulo git commit: ACCUMULO-3332 Fix incorrect import in cloudstone slaves.py

ACCUMULO-3332 Fix incorrect import in cloudstone slaves.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7356a88e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7356a88e Diff: http://git-wip-us.apache.org/r

[07/12] accumulo git commit: ACCUMULO-3334 Fix arguments passed to TeraSortIngest by CloudStone4

ACCUMULO-3334 Fix arguments passed to TeraSortIngest by CloudStone4 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8a6b15a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8a6b15a Diff: http://git-wip-us.apa

[09/12] accumulo git commit: ACCUMULO-3334 Fix arguments passed to TeraSortIngest by CloudStone4

ACCUMULO-3334 Fix arguments passed to TeraSortIngest by CloudStone4 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8a6b15a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8a6b15a Diff: http://git-wip-us.apa

[06/12] accumulo git commit: ACCUMULO-3333 Pass in username and password to `accumulo shell`

ACCUMULO- Pass in username and password to `accumulo shell` Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e74986ae Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e74986ae Diff: http://git-wip-us.apache.

[05/12] accumulo git commit: ACCUMULO-3333 Pass in username and password to `accumulo shell`

ACCUMULO- Pass in username and password to `accumulo shell` Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e74986ae Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e74986ae Diff: http://git-wip-us.apache.

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

[01/12] accumulo git commit: ACCUMULO-3332 Fix incorrect import in cloudstone slaves.py

Repository: accumulo Updated Branches: refs/heads/1.5 7789b200d -> a8a6b15ad refs/heads/1.6 27269c444 -> 2efeb52f8 refs/heads/master 58af0ce9f -> cbe15d911 ACCUMULO-3332 Fix incorrect import in cloudstone slaves.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http

[11/12] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: test/system/bench/cloudstone1/cloudstone1.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2efeb52f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2efeb52f Di

[03/12] accumulo git commit: ACCUMULO-3332 Fix incorrect import in cloudstone slaves.py

ACCUMULO-3332 Fix incorrect import in cloudstone slaves.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7356a88e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7356a88e Diff: http://git-wip-us.apache.org/r

[04/12] accumulo git commit: ACCUMULO-3333 Pass in username and password to `accumulo shell`

ACCUMULO- Pass in username and password to `accumulo shell` Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e74986ae Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e74986ae Diff: http://git-wip-us.apache.

[08/12] accumulo git commit: ACCUMULO-3334 Fix arguments passed to TeraSortIngest by CloudStone4

ACCUMULO-3334 Fix arguments passed to TeraSortIngest by CloudStone4 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8a6b15a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8a6b15a Diff: http://git-wip-us.apa

[1/3] accumulo git commit: ACCUMULO-3289 Increase memory as it appeared the one tserver might have had irregular timer thread activity

Repository: accumulo Updated Branches: refs/heads/1.6 7f1a55b9e -> 27269c444 refs/heads/master 60969b3e0 -> 58af0ce9f ACCUMULO-3289 Increase memory as it appeared the one tserver might have had irregular timer thread activity Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Co

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

Merge branch '1.6' Conflicts: test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/58af0ce9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo

[2/3] accumulo git commit: ACCUMULO-3289 Increase memory as it appeared the one tserver might have had irregular timer thread activity

ACCUMULO-3289 Increase memory as it appeared the one tserver might have had irregular timer thread activity Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/27269c44 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/