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

Merge branch '1.7' into 1.8 Conflicts: assemble/pom.xml test/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6cc07fa6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6cc07fa6 Diff:

[1/6] accumulo git commit: ACCUMULO-4390 Remove unnecessary build profiles

Repository: accumulo Updated Branches: refs/heads/1.7 cfebe5618 -> 9ad71110d refs/heads/1.8 1bba1eec5 -> 6cc07fa63 refs/heads/master 2c550740e -> 976854c6a ACCUMULO-4390 Remove unnecessary build profiles * Remove docs and assemble profiles (always run their tasks) * Trigger attaching

[2/6] accumulo git commit: ACCUMULO-4390 Remove unnecessary build profiles

ACCUMULO-4390 Remove unnecessary build profiles * Remove docs and assemble profiles (always run their tasks) * Trigger attaching src.tar.gz when created with apache-release profile * Remove unused vestigial shared-mini-for-it profile * Ensure dependencies for non-jars are optional, so they don't

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

Merge branch '1.8' Conflicts: assemble/pom.xml test/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/976854c6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/976854c6 Diff:

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

Merge branch '1.7' into 1.8 Conflicts: assemble/pom.xml test/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6cc07fa6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6cc07fa6 Diff:

[1/3] accumulo git commit: ACCUMULO-4381 Removed unused variable

Repository: accumulo Updated Branches: refs/heads/1.8 a11b28b35 -> 1bba1eec5 refs/heads/master 1ac95b6c6 -> 2c550740e ACCUMULO-4381 Removed unused variable Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1bba1eec

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

Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2c550740 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2c550740 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2c550740

[2/3] accumulo git commit: ACCUMULO-4381 Removed unused variable

ACCUMULO-4381 Removed unused variable Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1bba1eec Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1bba1eec Diff:

[2/3] accumulo git commit: ACCUMULO-4324 update data version

ACCUMULO-4324 update data version Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8aa1fc1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8aa1fc1 Diff:

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

Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1ac95b6c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1ac95b6c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1ac95b6c

[1/3] accumulo git commit: ACCUMULO-4324 Fixed issues found while attempting to run upgrade test

Repository: accumulo Updated Branches: refs/heads/master 7c1d58a41 -> 1ac95b6c6 ACCUMULO-4324 Fixed issues found while attempting to run upgrade test With these fixes was able to run the update test script going from 1.7.1 and 1.6.5 to 1.8.0-SNAP. Ran script with clean and dirty shutdown.

[1/2] accumulo git commit: ACCUMULO-4324 Fixed issues found while attempting to run upgrade test

Repository: accumulo Updated Branches: refs/heads/1.8 61e28dcb3 -> a11b28b35 ACCUMULO-4324 Fixed issues found while attempting to run upgrade test With these fixes was able to run the update test script going from 1.7.1 and 1.6.5 to 1.8.0-SNAP. Ran script with clean and dirty shutdown. Also

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

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

[2/6] accumulo git commit: ACCUMULO-4388: Move location to obtain zoo session.

ACCUMULO-4388: Move location to obtain zoo session. Change the location of obtaining the zoo session. Tests within ZooCacheTest appeared to cover these changes to ensure it did not break functionality; however if there are ideas I'll be glad to provide additional tests. Adding comments to make

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

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61e28dcb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61e28dcb Diff:

[3/6] accumulo git commit: ACCUMULO-4388: Move location to obtain zoo session.

ACCUMULO-4388: Move location to obtain zoo session. Change the location of obtaining the zoo session. Tests within ZooCacheTest appeared to cover these changes to ensure it did not break functionality; however if there are ideas I'll be glad to provide additional tests. Adding comments to make

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

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61e28dcb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61e28dcb Diff:

[1/6] accumulo git commit: ACCUMULO-4388: Move location to obtain zoo session.

Repository: accumulo Updated Branches: refs/heads/1.7 982286079 -> cfebe5618 refs/heads/1.8 d074eff92 -> 61e28dcb3 refs/heads/master 5df9bc16f -> 7c1d58a41 ACCUMULO-4388: Move location to obtain zoo session. Change the location of obtaining the zoo session. Tests within ZooCacheTest

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

Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5df9bc16 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5df9bc16 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5df9bc16

[1/2] accumulo git commit: ACCUMULO-4387 fix javadoc issue

Repository: accumulo Updated Branches: refs/heads/master ad985473a -> 5df9bc16f ACCUMULO-4387 fix javadoc issue Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d074eff9 Tree:

accumulo git commit: ACCUMULO-4387 fix javadoc issue

Repository: accumulo Updated Branches: refs/heads/1.8 c587a6f56 -> d074eff92 ACCUMULO-4387 fix javadoc issue Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d074eff9 Tree:

[2/2] accumulo git commit: Merge remote-tracking branch 'milleruntime/ACCUMULO-4367'

Merge remote-tracking branch 'milleruntime/ACCUMULO-4367' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ad985473 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ad985473 Diff:

[1/2] accumulo git commit: ACCUMULO-4367: fixed use of assertEquals and assertTrue in FilterTest

Repository: accumulo Updated Branches: refs/heads/master 2f8c8e7a4 -> ad985473a ACCUMULO-4367: fixed use of assertEquals and assertTrue in FilterTest Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1b0f4f3 Tree: