You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/10/01 18:47:51 UTC

[1/6] accumulo git commit: ACCUMULO-4015 Fix ExistingMacIT failure on Hadoop 1

Repository: accumulo
Updated Branches:
  refs/heads/1.6 9c206aa8f -> e24bd3672
  refs/heads/1.7 f59218006 -> 38f36e26e
  refs/heads/master 47cf834cb -> 18e834ec2


ACCUMULO-4015 Fix ExistingMacIT failure on Hadoop 1


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e24bd367
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e24bd367
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e24bd367

Branch: refs/heads/1.6
Commit: e24bd367263b399decbda7bae9a068c0dfe1add4
Parents: 9c206aa
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Oct 1 12:44:53 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Oct 1 12:44:53 2015 -0400

----------------------------------------------------------------------
 test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e24bd367/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
index 6330a59..d55e427 100644
--- a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
@@ -64,6 +64,7 @@ public class ExistingMacIT extends ConfigurableMacIT {
 
   private void createEmptyConfig(File confFile) throws IOException {
     Configuration conf = new Configuration(false);
+    conf.set("fs.file.impl", RawLocalFileSystem.class.getName());
     OutputStream hcOut = new FileOutputStream(confFile);
     conf.writeXml(hcOut);
     hcOut.close();


[2/6] accumulo git commit: ACCUMULO-4015 Fix ExistingMacIT failure on Hadoop 1

Posted by ct...@apache.org.
ACCUMULO-4015 Fix ExistingMacIT failure on Hadoop 1


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e24bd367
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e24bd367
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e24bd367

Branch: refs/heads/1.7
Commit: e24bd367263b399decbda7bae9a068c0dfe1add4
Parents: 9c206aa
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Oct 1 12:44:53 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Oct 1 12:44:53 2015 -0400

----------------------------------------------------------------------
 test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e24bd367/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
index 6330a59..d55e427 100644
--- a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
@@ -64,6 +64,7 @@ public class ExistingMacIT extends ConfigurableMacIT {
 
   private void createEmptyConfig(File confFile) throws IOException {
     Configuration conf = new Configuration(false);
+    conf.set("fs.file.impl", RawLocalFileSystem.class.getName());
     OutputStream hcOut = new FileOutputStream(confFile);
     conf.writeXml(hcOut);
     hcOut.close();


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

Posted by ct...@apache.org.
Merge branch '1.6' into 1.7

This merges ACCUMULO-4015 commits with -s ours, since that fix only
applies to the Hadoop 1 profile for Accumulo versions 1.6.x and does not
apply to 1.7 and later, which only support Hadoop 2.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/38f36e26
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/38f36e26
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/38f36e26

Branch: refs/heads/master
Commit: 38f36e26e31877d24c833ea1c090408635400816
Parents: f592180 e24bd36
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Oct 1 12:45:58 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Oct 1 12:45:58 2015 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------



[3/6] accumulo git commit: ACCUMULO-4015 Fix ExistingMacIT failure on Hadoop 1

Posted by ct...@apache.org.
ACCUMULO-4015 Fix ExistingMacIT failure on Hadoop 1


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e24bd367
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e24bd367
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e24bd367

Branch: refs/heads/master
Commit: e24bd367263b399decbda7bae9a068c0dfe1add4
Parents: 9c206aa
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Oct 1 12:44:53 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Oct 1 12:44:53 2015 -0400

----------------------------------------------------------------------
 test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e24bd367/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
index 6330a59..d55e427 100644
--- a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java
@@ -64,6 +64,7 @@ public class ExistingMacIT extends ConfigurableMacIT {
 
   private void createEmptyConfig(File confFile) throws IOException {
     Configuration conf = new Configuration(false);
+    conf.set("fs.file.impl", RawLocalFileSystem.class.getName());
     OutputStream hcOut = new FileOutputStream(confFile);
     conf.writeXml(hcOut);
     hcOut.close();


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

Posted by ct...@apache.org.
Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18e834ec
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18e834ec
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18e834ec

Branch: refs/heads/master
Commit: 18e834ec251fefa308a695f1bc2414c473e2e166
Parents: 47cf834 38f36e2
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Oct 1 12:47:31 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Oct 1 12:47:31 2015 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------



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

Posted by ct...@apache.org.
Merge branch '1.6' into 1.7

This merges ACCUMULO-4015 commits with -s ours, since that fix only
applies to the Hadoop 1 profile for Accumulo versions 1.6.x and does not
apply to 1.7 and later, which only support Hadoop 2.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/38f36e26
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/38f36e26
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/38f36e26

Branch: refs/heads/1.7
Commit: 38f36e26e31877d24c833ea1c090408635400816
Parents: f592180 e24bd36
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Oct 1 12:45:58 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Oct 1 12:45:58 2015 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------