You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/08/05 20:21:49 UTC
[1/2] git commit: ACCUMULO-3007 made volume replacement ignore
relative paths
Repository: accumulo
Updated Branches:
refs/heads/master 962eb982e -> c45c3570a
ACCUMULO-3007 made volume replacement ignore relative paths
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62093088
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62093088
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62093088
Branch: refs/heads/master
Commit: 62093088eb8b989c7b0571a372cc7197edbae3d2
Parents: 67c1757
Author: Keith Turner <kt...@apache.org>
Authored: Mon Jul 21 13:22:28 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Aug 5 14:20:47 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62093088/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
index 436667c..c87074b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
@@ -87,6 +87,11 @@ public class VolumeUtil {
return null;
}
+ if (!path.contains(":")) {
+ // ignore relative paths
+ return null;
+ }
+
Path p = new Path(path);
// removing slash because new Path("hdfs://nn1").equals(new Path("hdfs://nn1/")) evaluates to false
[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by ec...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c45c3570
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c45c3570
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c45c3570
Branch: refs/heads/master
Commit: c45c3570aabdfcf3d31b05acf441d405ddadf399
Parents: 962eb98 6209308
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Aug 5 14:21:01 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Aug 5 14:21:01 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c45c3570/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
----------------------------------------------------------------------