[12/14] git commit: ACCUMULO-2455 small work arounds to increase the chance that zookeeper updates are in place before tservers need to see them

ACCUMULO-2455 small work arounds to increase the chance that zookeeper updates are in place before tservers need to see them Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/09307322 Tree: http://git-wip-us.apache.org/re

[02/14] 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

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

Repository: accumulo Updated Branches: refs/heads/ACCUMULO-2061 243aafa49 -> db76dd751 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

[05/14] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 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/6b2704c7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6b2704c7 Diff: http://git-wip-us.apache.org/repos/asf/

[14/14] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into ACCUMULO-2061

Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into ACCUMULO-2061 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db76dd75 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/db76dd75 Diff: http://git-wip-us

[10/14] git commit: ACCUMULO-2061 Add another test which doesn't start with /accumulo

ACCUMULO-2061 Add another test which doesn't start with /accumulo Make sure that the garbage collector is expecting anything special like /accumulo in the path. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bf5da442 T

[09/14] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/3ed0bbd6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3

[04/14] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours)

Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/19231a25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/19231a25 Diff: http://git-wip-us.apache.org/r

[03/14] git commit: ACCUMULO-2450 Backport of ACCUMULO-2438 to 1.4: ensure that we watch separate sets of tables for merges (cherry picked from commit 12b53b043b60368fb647db9c0a15916171d4504b)

ACCUMULO-2450 Backport of ACCUMULO-2438 to 1.4: ensure that we watch separate sets of tables for merges (cherry picked from commit 12b53b043b60368fb647db9c0a15916171d4504b) Original authors: Eric Newton (1.6+), Josh Elser (1.5 backport) This backport does not include the new DeleteRowsTest, as n

[06/14] git commit: ACCUMULO-2433 It would help to actually pass the error message to the assertion

ACCUMULO-2433 It would help to actually pass the error message to the assertion Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43cebf8c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43cebf8c Diff: http://gi

[11/14] git commit: ACCUMULO-2267 Add missing license headers.

ACCUMULO-2267 Add missing license headers. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46bf772d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46bf772d Diff: http://git-wip-us.apache.org/repos/asf/accumul

[08/14] git commit: ACCUMULO-2267 added a basic config rpm, initialize hdfs for accumulo, deal with versions on the accumulo jars, fix the start-up scripts, tested on Centos6.5

ACCUMULO-2267 added a basic config rpm, initialize hdfs for accumulo, deal with versions on the accumulo jars, fix the start-up scripts, tested on Centos6.5 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fc4de902 Tree:

[13/14] git commit: ACCUMULO-2061 Excessive logging

ACCUMULO-2061 Excessive logging Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/85b5caf4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/85b5caf4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/85b5

[07/14] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 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/97607425 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97607425 Diff: http://git-wip-us.apache.org/repos/asf/

git commit: ACCUMULO-2267 Incorrect version in init/pom.xml

Repository: accumulo Updated Branches: refs/heads/master edf659544 -> a085d6233 ACCUMULO-2267 Incorrect version in init/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a085d623 Tree: http://git-wip-us.apache.

[1/2] git commit: ACCUMULO-2455 small work arounds to increase the chance that zookeeper updates are in place before tservers need to see them

Repository: accumulo Updated Branches: refs/heads/master 0dda8a511 -> edf659544 ACCUMULO-2455 small work arounds to increase the chance that zookeeper updates are in place before tservers need to see them Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us

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

git commit: ACCUMULO-2455 small work arounds to increase the chance that zookeeper updates are in place before tservers need to see them

Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 46bf772d6 -> 09307322a ACCUMULO-2455 small work arounds to increase the chance that zookeeper updates are in place before tservers need to see them Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://gi

[3/4] git commit: ACCUMULO-2267 Add missing license headers.

ACCUMULO-2267 Add missing license headers. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46bf772d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46bf772d Diff: http://git-wip-us.apache.org/repos/asf/accumul

[1/4] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 3ed0bbd65 -> 46bf772d6 refs/heads/master f4b37443c -> 0dda8a511 Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/re

[4/4] 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/0dda8a51 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0dda8a51 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0dda8a

[2/4] git commit: ACCUMULO-2267 Add missing license headers.

ACCUMULO-2267 Add missing license headers. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46bf772d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46bf772d Diff: http://git-wip-us.apache.org/repos/asf/accumul

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

Merge branch '1.5.2-SNAPSHOT' into 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/97607425 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97607425 Diff: http://git-wip-us.apache.org/repos/asf/

[1/8] git commit: ACCUMULO-2433 It would help to actually pass the error message to the assertion

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 19231a25c -> 43cebf8c0 refs/heads/1.6.0-SNAPSHOT fc4de9022 -> 3ed0bbd65 refs/heads/master 27abe8352 -> f4b37443c ACCUMULO-2433 It would help to actually pass the error message to the assertion Project: http://git-wip-us.apac

[6/8] 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/ecf5ef78 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ecf5ef78 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ecf5ef

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

Merge branch '1.5.2-SNAPSHOT' into 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/97607425 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97607425 Diff: http://git-wip-us.apache.org/repos/asf/

[2/8] git commit: ACCUMULO-2433 It would help to actually pass the error message to the assertion

ACCUMULO-2433 It would help to actually pass the error message to the assertion Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43cebf8c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43cebf8c Diff: http://gi

[3/8] git commit: ACCUMULO-2433 It would help to actually pass the error message to the assertion

ACCUMULO-2433 It would help to actually pass the error message to the assertion Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43cebf8c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43cebf8c Diff: http://gi

[7/8] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/3ed0bbd6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3

[8/8] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f4b37443 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f4b37443 Diff: http://git-wip-

[1/2] git commit: ACCUMULO-2267 added a basic config rpm, initialize hdfs for accumulo, deal with versions on the accumulo jars, fix the start-up scripts, tested on Centos6.5

Repository: accumulo Updated Branches: refs/heads/master ae4620972 -> 27abe8352 ACCUMULO-2267 added a basic config rpm, initialize hdfs for accumulo, deal with versions on the accumulo jars, fix the start-up scripts, tested on Centos6.5 Project: http://git-wip-us.apache.org/repos/asf/accumul

[2/2] 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/27abe835 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/27abe835 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/27abe8

git commit: ACCUMULO-2267 added a basic config rpm, initialize hdfs for accumulo, deal with versions on the accumulo jars, fix the start-up scripts, tested on Centos6.5

Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 6b2704c7e -> fc4de9022 ACCUMULO-2267 added a basic config rpm, initialize hdfs for accumulo, deal with versions on the accumulo jars, fix the start-up scripts, tested on Centos6.5 Project: http://git-wip-us.apache.org/repos/asf

git commit: ACCUMULO-2061 Update now invalid assertions in VolumeIT

Repository: accumulo Updated Branches: refs/heads/ACCUMULO-2061 2da21b6a4 -> 243aafa49 ACCUMULO-2061 Update now invalid assertions in VolumeIT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/243aafa4 Tree: http://git

[16/23] 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

[23/23] git commit: ACCUMULO-2061 Update FileTypeTest to assert that volumes don't need to have an 'accumulo' directory

ACCUMULO-2061 Update FileTypeTest to assert that volumes don't need to have an 'accumulo' directory Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2da21b6a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2da

[13/23] 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

[07/23] git commit: ACCUMULO-2438 Backport the changes to ensure that we watch separate sets of tables for merges

ACCUMULO-2438 Backport the changes to ensure that we watch separate sets of tables for merges Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/12b53b04 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/12b53b04

[11/23] 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

[03/23] git commit: ACCUMULO-2061 Fix FileUtil

ACCUMULO-2061 Fix FileUtil Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3b3ccbb0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3b3ccbb0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3b3ccbb0

[08/23] 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: server/src/main/java/org/apache/accumulo/server/master/Master.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a63e7c9b Tree: http://git-wip-us.ap

[12/23] 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:/

[06/23] git commit: ACCUMULO-2061 Get all of the unit tests running successfully

ACCUMULO-2061 Get all of the unit tests running successfully Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e97b093b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e97b093b Diff: http://git-wip-us.apache.org

[20/23] git commit: ACCUMULO-2061 Don't store the defaultVolume in with the rest but expect it in the constructor.

ACCUMULO-2061 Don't store the defaultVolume in with the rest but expect it in the constructor. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c3214e0e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c3214e0e

[21/23] git commit: ACCUMULO-2061 Remove implicit assumptions about '/accumulo' directory that all volumes would have.

ACCUMULO-2061 Remove implicit assumptions about '/accumulo' directory that all volumes would have. Added some extra logging at trace to help if this needs to be revisited. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commi

[22/23] git commit: ACCUMULO-2061 Don't use the default volume, use one of the "real" volumes.

ACCUMULO-2061 Don't use the default volume, use one of the "real" volumes. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9060185c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9060185c Diff: http://git-wip

[04/23] git commit: ACCUMULO-2061 Fix the rest of server-base

ACCUMULO-2061 Fix the rest of server-base Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e613f710 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e613f710 Diff: http://git-wip-us.apache.org/repos/asf/accumulo

[09/23] 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

[01/23] git commit: ACCUMULO-2438 Rename the test so that surefire doesn't pick it up as a unit test

Repository: accumulo Updated Branches: refs/heads/ACCUMULO-2061 43a7ebda2 -> 2da21b6a4 ACCUMULO-2438 Rename the test so that surefire doesn't pick it up as a unit test Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/

[14/23] 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/23] git commit: ACCUMULO-2061 Fix up ServerConstants and make ChangeSecret reset the instanceId on all Volumes

ACCUMULO-2061 Fix up ServerConstants and make ChangeSecret reset the instanceId on all Volumes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c841568 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c841568

[18/23] 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

[19/23] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into ACCUMULO-2061

Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into ACCUMULO-2061 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3eb1593a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3eb1593a Diff: http://git-wip-us

[10/23] 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

[05/23] git commit: ACCUMULO-2441 outline the file prefix conventions

ACCUMULO-2441 outline the file prefix conventions Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0297276e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0297276e Diff: http://git-wip-us.apache.org/repos/asf/

[15/23] 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

[05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours)

Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/19231a25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/19231a25 Diff: http://git-wip-us.apache.org/r

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

[07/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours)

Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/19231a25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/19231a25 Diff: http://git-wip-us.apache.org/r

[04/10] git commit: ACCUMULO-2450 Backport of ACCUMULO-2438 to 1.4: ensure that we watch separate sets of tables for merges (cherry picked from commit 12b53b043b60368fb647db9c0a15916171d4504b)

ACCUMULO-2450 Backport of ACCUMULO-2438 to 1.4: ensure that we watch separate sets of tables for merges (cherry picked from commit 12b53b043b60368fb647db9c0a15916171d4504b) Original authors: Eric Newton (1.6+), Josh Elser (1.5 backport) This backport does not include the new DeleteRowsTest, as n

[09/10] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 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/6b2704c7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6b2704c7 Diff: http://git-wip-us.apache.org/repos/asf/

[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours)

Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/19231a25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/19231a25 Diff: http://git-wip-us.apache.org/r

[03/10] git commit: ACCUMULO-2450 Backport of ACCUMULO-2438 to 1.4: ensure that we watch separate sets of tables for merges (cherry picked from commit 12b53b043b60368fb647db9c0a15916171d4504b)

ACCUMULO-2450 Backport of ACCUMULO-2438 to 1.4: ensure that we watch separate sets of tables for merges (cherry picked from commit 12b53b043b60368fb647db9c0a15916171d4504b) Original authors: Eric Newton (1.6+), Josh Elser (1.5 backport) This backport does not include the new DeleteRowsTest, as n

[08/10] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 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/6b2704c7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6b2704c7 Diff: http://git-wip-us.apache.org/repos/asf/

[01/10] git commit: ACCUMULO-2450 Backport of ACCUMULO-2438 to 1.4: ensure that we watch separate sets of tables for merges (cherry picked from commit 12b53b043b60368fb647db9c0a15916171d4504b)

Repository: accumulo Updated Branches: refs/heads/1.4.5-SNAPSHOT 6faac421b -> 117dce765 refs/heads/1.5.2-SNAPSHOT 6c050913c -> 19231a25c refs/heads/1.6.0-SNAPSHOT fb17d4588 -> 6b2704c7e refs/heads/master 29e2519e0 -> ae4620972 ACCUMULO-2450 Backport of ACCUMULO-2438 to 1.4: ensure that we

[02/10] git commit: ACCUMULO-2450 Backport of ACCUMULO-2438 to 1.4: ensure that we watch separate sets of tables for merges (cherry picked from commit 12b53b043b60368fb647db9c0a15916171d4504b)

ACCUMULO-2450 Backport of ACCUMULO-2438 to 1.4: ensure that we watch separate sets of tables for merges (cherry picked from commit 12b53b043b60368fb647db9c0a15916171d4504b) Original authors: Eric Newton (1.6+), Josh Elser (1.5 backport) This backport does not include the new DeleteRowsTest, as n