[3/6] git commit: ACCUMULO-2438 Timeout is a little too tight on a busy system.

ACCUMULO-2438 Timeout is a little too tight on a busy system. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c050913 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c050913 Diff: http://git-wip-us.apache.or

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

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/29e2519e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29e2519e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/29e251

[2/6] git commit: ACCUMULO-2438 Timeout is a little too tight on a busy system.

ACCUMULO-2438 Timeout is a little too tight on a busy system. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c050913 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c050913 Diff: http://git-wip-us.apache.or

[1/6] git commit: ACCUMULO-2438 Timeout is a little too tight on a busy system.

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 4cc25caa0 -> 6c050913c refs/heads/1.6.0-SNAPSHOT da7f937b1 -> fb17d4588 refs/heads/master 389003fde -> 29e2519e0 ACCUMULO-2438 Timeout is a little too tight on a busy system. Project: http://git-wip-us.apache.org/repos/asf/a

[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb17d458 Tree: http://git-wip-us.apach

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb17d458 Tree: http://git-wip-us.apach

[15/16] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java test

[03/16] git commit: ACCUMULO-2447 Always set PrintWriter on Shell and don't print to stderr.

ACCUMULO-2447 Always set PrintWriter on Shell and don't print to stderr. While we don't have access to the printwriter/outputstream from the jline ConsoleReader, we can force the user to pass in one (or just make one for stdout). This will allow unit tests to correctly squash all output into a byt

[10/16] Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7f937b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index 7a1121f,000..e0ad1bd

[08/16] git commit: ACCUMULO-2433 Add a way to still use the exec methods but provide a custom error message on failure.

ACCUMULO-2433 Add a way to still use the exec methods but provide a custom error message on failure. Fix some tests that I've seen fail to provide better messages on failure to help future debugging because I can't get them reproduced locally in any reasonable timeframe. Project: http://git-wi

[13/16] Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7f937b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index 7a1121f,000..e0ad1bd

[04/16] git commit: ACCUMULO-2447 Always set PrintWriter on Shell and don't print to stderr.

ACCUMULO-2447 Always set PrintWriter on Shell and don't print to stderr. While we don't have access to the printwriter/outputstream from the jline ConsoleReader, we can force the user to pass in one (or just make one for stdout). This will allow unit tests to correctly squash all output into a byt

[06/16] git commit: ACCUMULO-1936 Make testInstanceOperations a more reliable test.

ACCUMULO-1936 Make testInstanceOperations a more reliable test. Avoid pulling scans for users other than root and compactions for compactions over tables other than the one we're looking at. Slow down the slow iterator even more. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Comm

[01/16] git commit: ACCUMULO-1936 Make testInstanceOperations a more reliable test.

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT bc9cee0c0 -> 4cc25caa0 refs/heads/1.6.0-SNAPSHOT 4223d6681 -> da7f937b1 refs/heads/master 977d41d7b -> 389003fde ACCUMULO-1936 Make testInstanceOperations a more reliable test. Avoid pulling scans for users other than root an

[09/16] git commit: ACCUMULO-2433 Add a way to still use the exec methods but provide a custom error message on failure.

ACCUMULO-2433 Add a way to still use the exec methods but provide a custom error message on failure. Fix some tests that I've seen fail to provide better messages on failure to help future debugging because I can't get them reproduced locally in any reasonable timeframe. Project: http://git-wi

[07/16] git commit: ACCUMULO-2433 Add a way to still use the exec methods but provide a custom error message on failure.

ACCUMULO-2433 Add a way to still use the exec methods but provide a custom error message on failure. Fix some tests that I've seen fail to provide better messages on failure to help future debugging because I can't get them reproduced locally in any reasonable timeframe. Project: http://git-wi

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

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/389003fd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/389003fd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/389003

[12/16] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java test

[05/16] git commit: ACCUMULO-1936 Make testInstanceOperations a more reliable test.

ACCUMULO-1936 Make testInstanceOperations a more reliable test. Avoid pulling scans for users other than root and compactions for compactions over tables other than the one we're looking at. Slow down the slow iterator even more. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Comm

[02/16] git commit: ACCUMULO-2447 Always set PrintWriter on Shell and don't print to stderr.

ACCUMULO-2447 Always set PrintWriter on Shell and don't print to stderr. While we don't have access to the printwriter/outputstream from the jline ConsoleReader, we can force the user to pass in one (or just make one for stdout). This will allow unit tests to correctly squash all output into a byt

[2/2] git commit: ACCUMULO-2020 Wikisearch should manage dependency conflicts.

ACCUMULO-2020 Wikisearch should manage dependency conflicts. Update enforcer plugin to require dependency convergence, fix conflicts. Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/73e321e0 Tree

[1/2] git commit: ACCUMULO-1882 wikisearch-ingest module fails to build.

Repository: accumulo-wikisearch Updated Branches: refs/heads/1.4.5-SNAPSHOT 1e4a40bcc -> 73e321e0e ACCUMULO-1882 wikisearch-ingest module fails to build. Work around MDEP-187 by using prepare-package instead of process-resources to copy deps to the lib/ directory. Project: http://git-wip-us

[3/3] git commit: ACCUMULO-2019 Fix packaging and deployment instructions for wikisearch query interface.

ACCUMULO-2019 Fix packaging and deployment instructions for wikisearch query interface. * update directions for project move to contrib * update $ACCUMULO_HOME/lib/ext needs based on what ships with current Accumulo installation. * update the dependencies included in the query dist tarball for t

[1/3] git commit: ACCUMULO-2017 Wikisearch should use Guava instead of Google Collections.

Repository: accumulo-wikisearch Updated Branches: refs/heads/1.4.5-SNAPSHOT e15859054 -> 1e4a40bcc ACCUMULO-2017 Wikisearch should use Guava instead of Google Collections. replaces Google Collections with Google Guava because that's what Hadoop 2 uses internally and they conflict. Project:

[2/3] git commit: ACCUMULO-2018 Wikisearch Parallel Ingest script should use parallel configuration file.

ACCUMULO-2018 Wikisearch Parallel Ingest script should use parallel configuration file. make sure parallel ingester uses parallel config, per README.parallel Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-wikise

[12/13] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Delete conflicts; functional tests moved to ITs. Conflicts: test/src/main/java/org/apache/accumulo/test/functional/RunTests.java test/system/auto/README Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http:/

[09/13] git commit: ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag

ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag (reimplemented for 1.5.x branch) Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.or

[06/13] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT -sours merge, 1.5.x specific changes in follow on patch. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32dc1040 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/t

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

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/977d41d7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/977d41d7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/977d41

[03/13] git commit: ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag

ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6faac4

[02/13] git commit: ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag

ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6faac4

[04/13] git commit: ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag

ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6faac4

[10/13] git commit: ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag

ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag (reimplemented for 1.5.x branch) Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.or

[08/13] git commit: ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag

ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag (reimplemented for 1.5.x branch) Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.or

[07/13] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT -sours merge, 1.5.x specific changes in follow on patch. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32dc1040 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/t

[01/13] git commit: ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag

Repository: accumulo Updated Branches: refs/heads/1.4.5-SNAPSHOT 4fd48fd23 -> 6faac421b refs/heads/1.5.2-SNAPSHOT 12b53b043 -> bc9cee0c0 refs/heads/1.6.0-SNAPSHOT a63e7c9b9 -> 4223d6681 refs/heads/master f3083c7bb -> 977d41d7b ACCUMULO-2005: Add a 3rd argument to functional test RunTests.

[11/13] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Delete conflicts; functional tests moved to ITs. Conflicts: test/src/main/java/org/apache/accumulo/test/functional/RunTests.java test/system/auto/README Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http:/

[05/13] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT -sours merge, 1.5.x specific changes in follow on patch. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32dc1040 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/t