[2/6] accumulo git commit: ACCUMULO-4072 Document how to run multiple tservers on one host in user manual

ACCUMULO-4072 Document how to run multiple tservers on one host in user manual Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/97a92a09 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97a92a09 Diff: http://git

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

Merge branch '1.6' into 1.7 Conflicts: docs/src/main/latex/accumulo_user_manual/chapters/administration.tex Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/14e88e4b Tree: http://git-wip-us.apache.org/repos/asf/a

[6/6] accumulo git commit: Merge branch '1.7'

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

[1/6] accumulo git commit: ACCUMULO-4072 Document how to run multiple tservers on one host in user manual

Repository: accumulo Updated Branches: refs/heads/1.6 da7aaeae9 -> 97a92a091 refs/heads/1.7 5efa0bd9b -> 14e88e4ba refs/heads/master 7b1e26ae2 -> 7f4cb62b0 ACCUMULO-4072 Document how to run multiple tservers on one host in user manual Project: http://git-wip-us.apache.org/repos/asf/accumu

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

Merge branch '1.6' into 1.7 Conflicts: docs/src/main/latex/accumulo_user_manual/chapters/administration.tex Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/14e88e4b Tree: http://git-wip-us.apache.org/repos/asf/a

[3/6] accumulo git commit: ACCUMULO-4072 Document how to run multiple tservers on one host in user manual

ACCUMULO-4072 Document how to run multiple tservers on one host in user manual Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/97a92a09 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97a92a09 Diff: http://git

accumulo git commit: ACCUMULO-4091 added MutationsRejectedException discussions

Repository: accumulo Updated Branches: refs/heads/master af040bfb4 -> 7b1e26ae2 ACCUMULO-4091 added MutationsRejectedException discussions Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7b1e26ae Tree: http://git-wip