[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-04-28 Thread elserj
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb7534b4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb7534b4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fb7534

[1/3] git commit: ACCUMULO-2752 Adding accidentally omitted getZooKeeperPort method

2014-04-28 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 1f7dd2d53 -> f5bcee7ae refs/heads/master b48b13acb -> fb7534b4d ACCUMULO-2752 Adding accidentally omitted getZooKeeperPort method Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.o

[2/3] git commit: ACCUMULO-2752 Adding accidentally omitted getZooKeeperPort method

2014-04-28 Thread elserj
ACCUMULO-2752 Adding accidentally omitted getZooKeeperPort method Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f5bcee7a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f5bcee7a Diff: http://git-wip-us.apach

[1/3] git commit: ACCUMULO-2742 offset history command by one

2014-04-28 Thread mdrob
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 0aa475895 -> 1f7dd2d53 refs/heads/master a723216a7 -> b48b13acb ACCUMULO-2742 offset history command by one The history entries returned by the history command are 0-indexed, while the history expansion is 1-indexed. We need to

[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-04-28 Thread mdrob
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b48b13ac Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b48b13ac Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b48b13

[2/3] git commit: ACCUMULO-2742 offset history command by one

2014-04-28 Thread mdrob
ACCUMULO-2742 offset history command by one The history entries returned by the history command are 0-indexed, while the history expansion is 1-indexed. We need to offset the index when we print it so that users can accurately use event expansion. Project: http://git-wip-us.apache.org/repos/asf/

[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-04-28 Thread elserj
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a723216a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a723216a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a72321

[2/3] git commit: ACCUMULO-2680 Extend the timeout even more

2014-04-28 Thread elserj
ACCUMULO-2680 Extend the timeout even more Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0aa47589 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0aa47589 Diff: http://git-wip-us.apache.org/repos/asf/accumul

[1/3] git commit: ACCUMULO-2680 Extend the timeout even more

2014-04-28 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT d2caaa2d6 -> 0aa475895 refs/heads/master 041761ca6 -> a723216a7 ACCUMULO-2680 Extend the timeout even more Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/c

[1/7] git commit: ACCUMULO-2745 Update README files with license headers

2014-04-28 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 448e75780 -> d2caaa2d6 refs/heads/master eae953e6a -> 041761ca6 ACCUMULO-2745 Update README files with license headers Replaced readme.txt without a license header with a README that has one, for naming consistency. Proje

[6/7] git commit: ACCUMULO-2751 Remove outdated ScaleTest.odp presentation

2014-04-28 Thread ctubbsii
ACCUMULO-2751 Remove outdated ScaleTest.odp presentation This file would be better suited on the website somewhere, if kept at all. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d2caaa2d Tree: http://git-wip-us.apac

[4/7] git commit: ACCUMULO-2750 Remove unused state diagrams from docs module

2014-04-28 Thread ctubbsii
ACCUMULO-2750 Remove unused state diagrams from docs module These files would be better suited on the website or in a wiki. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c4809e5f Tree: http://git-wip-us.apache.org/r

[5/7] git commit: ACCUMULO-2751 Remove outdated ScaleTest.odp presentation

2014-04-28 Thread ctubbsii
ACCUMULO-2751 Remove outdated ScaleTest.odp presentation This file would be better suited on the website somewhere, if kept at all. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d2caaa2d Tree: http://git-wip-us.apac

[2/7] git commit: ACCUMULO-2745 Update README files with license headers

2014-04-28 Thread ctubbsii
ACCUMULO-2745 Update README files with license headers Replaced readme.txt without a license header with a README that has one, for naming consistency. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c0234ad8 Tree:

[7/7] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-04-28 Thread ctubbsii
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/041761ca Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/041761ca Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/041761

[3/7] git commit: ACCUMULO-2750 Remove unused state diagrams from docs module

2014-04-28 Thread ctubbsii
ACCUMULO-2750 Remove unused state diagrams from docs module These files would be better suited on the website or in a wiki. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c4809e5f Tree: http://git-wip-us.apache.org/r