[2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/712e946d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/712e946d Diff: http://git-wip-us.apache.org/repos/asf/

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

Merge branch '1.5.1-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/417902e2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/417902e2 Diff: http://git-wip-us.apache.org/repos/asf/

[1/2] git commit: ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

Updated Branches: refs/heads/1.5.1-SNAPSHOT d63cf6fe5 -> 712e946d1 ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change. Signed-off-by: Christopher Tubbs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/ac

[1/3] git commit: ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

Updated Branches: refs/heads/1.6.0-SNAPSHOT b5e84bcd3 -> 417902e21 ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change. Signed-off-by: Christopher Tubbs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/ac

git commit: ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

Updated Branches: refs/heads/1.4.5-SNAPSHOT 1ad1151ab -> 0b6749a4f ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change. Signed-off-by: Christopher Tubbs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/ac

[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/712e946d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/712e946d Diff: http://git-wip-us.apache.org/repos/asf/

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/system/auto/simple/examples.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b5e84bcd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tre

[1/3] git commit: ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

Updated Branches: refs/heads/1.6.0-SNAPSHOT 114b58dca -> b5e84bcd3 ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME. Signed-off-by: Christopher Tubbs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/a

[2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/system/auto/simple/examples.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d63cf6fe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tre

[1/2] git commit: ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

Updated Branches: refs/heads/1.5.1-SNAPSHOT 89c996229 -> d63cf6fe5 ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME. Signed-off-by: Christopher Tubbs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/a

[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/system/auto/simple/examples.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d63cf6fe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tre

git commit: ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

Updated Branches: refs/heads/1.4.5-SNAPSHOT d605ebb52 -> 1ad1151ab ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME. Signed-off-by: Christopher Tubbs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/a

[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/system/auto/simple/readwrite.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/89c99622 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tr

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

[07/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/system/auto/simple/readwrite.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/89c99622 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tr

[05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/system/auto/simple/readwrite.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/89c99622 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tr

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/system/auto/TestUtils.py test/system/auto/simple/readwrite.py test/system/auto/simple/zooCacheTest.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos

[01/10] git commit: ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

Updated Branches: refs/heads/1.4.5-SNAPSHOT f56ae10b3 -> d605ebb52 refs/heads/1.5.1-SNAPSHOT 20cc9f4ec -> 89c996229 refs/heads/1.6.0-SNAPSHOT 072d54e1f -> 114b58dca refs/heads/master cc4e8e7b5 -> a1eb475ed ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file. Sig

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/system/auto/TestUtils.py test/system/auto/simple/readwrite.py test/system/auto/simple/zooCacheTest.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos

[04/10] git commit: ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file. Signed-off-by: Mike Drob Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d605ebb5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tre

[03/10] git commit: ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file. Signed-off-by: Mike Drob Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d605ebb5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tre

[02/10] git commit: ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file.

ACCUMULO-2109 make sure functional tests clean up generate accumulo-site file. Signed-off-by: Mike Drob Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d605ebb5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tre

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

[6/7] 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/072d54e1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0

[4/7] git commit: ACCUMULO-2110 cannot remove a FileRef with a Path

ACCUMULO-2110 cannot remove a FileRef with a Path Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/16ccbf5e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/16ccbf5e Diff: http://git-wip-us.apache.org/repos/asf/

[3/7] 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/3420097e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3420097e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/342009

[5/7] 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/072d54e1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0

[1/7] git commit: ACCUMULO-2110 cannot remove a FileRef with a Path

Updated Branches: refs/heads/1.6.0-SNAPSHOT 16ccbf5e1 -> 072d54e1f refs/heads/master bdc6c041a -> cc4e8e7b5 ACCUMULO-2110 cannot remove a FileRef with a Path Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec772482

[2/7] git commit: ACCUMULO-2110 cannot remove a FileRef with a Path

ACCUMULO-2110 cannot remove a FileRef with a Path Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec772482 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec772482 Diff: http://git-wip-us.apache.org/repos/asf/

git commit: ACCUMULO-2110 cannot remove a FileRef with a Path

Updated Branches: refs/heads/1.6.0-SNAPSHOT 379881e69 -> 16ccbf5e1 ACCUMULO-2110 cannot remove a FileRef with a Path Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/16ccbf5e Tree: http://git-wip-us.apache.org/repos/a