You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/04/04 18:32:41 UTC
[1/6] git commit: ACCUMULO-2617 Fix the locationByProgram to account
for the extra 'bin' directory
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT 75d62a462 -> e3e03be8d
refs/heads/1.6.0-SNAPSHOT b3f6e0f8f -> 696057025
refs/heads/master 4e3696f13 -> e176aa6a1
ACCUMULO-2617 Fix the locationByProgram to account for the extra 'bin' directory
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e3e03be8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e3e03be8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e3e03be8
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: e3e03be8d1c90d54d58e11c8ea30e479c624d23c
Parents: 75d62a4
Author: Josh Elser <el...@apache.org>
Authored: Wed Apr 2 16:49:52 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Apr 4 12:25:25 2014 -0400
----------------------------------------------------------------------
bin/accumulo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e3e03be8/bin/accumulo
----------------------------------------------------------------------
diff --git a/bin/accumulo b/bin/accumulo
index 2ad8720..75ba63f 100755
--- a/bin/accumulo
+++ b/bin/accumulo
@@ -45,8 +45,8 @@ locationByProgram()
RESULT="$(readlink "${RESULT}")"
[[ "${RESULT}" != /* ]] && RESULT="${DIR}/${RESULT}" # if $RESULT was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done
- # find the relative home directory
- RESULT=$(dirname "${RESULT}")
+ # find the relative home directory, accounting for an extra bin directory
+ RESULT=$(dirname $(dirname "${RESULT}") )
echo "Auto-set ${2} to '${RESULT}'. To suppress this message, set ${2} in conf/accumulo-env.sh"
eval "${2}=${RESULT}"
}
[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
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/69605702
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/69605702
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/69605702
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6960570252751a6a2fcda6da19755462405f6116
Parents: b3f6e0f e3e03be
Author: Josh Elser <el...@apache.org>
Authored: Fri Apr 4 12:32:24 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Apr 4 12:32:24 2014 -0400
----------------------------------------------------------------------
bin/accumulo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/69605702/bin/accumulo
----------------------------------------------------------------------
[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by el...@apache.org.
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/e176aa6a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e176aa6a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e176aa6a
Branch: refs/heads/master
Commit: e176aa6a1499c0c12482fd94c83e7e46061a1966
Parents: 4e3696f 6960570
Author: Josh Elser <el...@apache.org>
Authored: Fri Apr 4 12:32:37 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Apr 4 12:32:37 2014 -0400
----------------------------------------------------------------------
bin/accumulo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/6] git commit: ACCUMULO-2617 Fix the locationByProgram to account
for the extra 'bin' directory
Posted by el...@apache.org.
ACCUMULO-2617 Fix the locationByProgram to account for the extra 'bin' directory
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e3e03be8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e3e03be8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e3e03be8
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: e3e03be8d1c90d54d58e11c8ea30e479c624d23c
Parents: 75d62a4
Author: Josh Elser <el...@apache.org>
Authored: Wed Apr 2 16:49:52 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Apr 4 12:25:25 2014 -0400
----------------------------------------------------------------------
bin/accumulo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e3e03be8/bin/accumulo
----------------------------------------------------------------------
diff --git a/bin/accumulo b/bin/accumulo
index 2ad8720..75ba63f 100755
--- a/bin/accumulo
+++ b/bin/accumulo
@@ -45,8 +45,8 @@ locationByProgram()
RESULT="$(readlink "${RESULT}")"
[[ "${RESULT}" != /* ]] && RESULT="${DIR}/${RESULT}" # if $RESULT was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done
- # find the relative home directory
- RESULT=$(dirname "${RESULT}")
+ # find the relative home directory, accounting for an extra bin directory
+ RESULT=$(dirname $(dirname "${RESULT}") )
echo "Auto-set ${2} to '${RESULT}'. To suppress this message, set ${2} in conf/accumulo-env.sh"
eval "${2}=${RESULT}"
}
[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
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/69605702
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/69605702
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/69605702
Branch: refs/heads/master
Commit: 6960570252751a6a2fcda6da19755462405f6116
Parents: b3f6e0f e3e03be
Author: Josh Elser <el...@apache.org>
Authored: Fri Apr 4 12:32:24 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Apr 4 12:32:24 2014 -0400
----------------------------------------------------------------------
bin/accumulo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/69605702/bin/accumulo
----------------------------------------------------------------------
[3/6] git commit: ACCUMULO-2617 Fix the locationByProgram to account
for the extra 'bin' directory
Posted by el...@apache.org.
ACCUMULO-2617 Fix the locationByProgram to account for the extra 'bin' directory
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e3e03be8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e3e03be8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e3e03be8
Branch: refs/heads/master
Commit: e3e03be8d1c90d54d58e11c8ea30e479c624d23c
Parents: 75d62a4
Author: Josh Elser <el...@apache.org>
Authored: Wed Apr 2 16:49:52 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Apr 4 12:25:25 2014 -0400
----------------------------------------------------------------------
bin/accumulo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e3e03be8/bin/accumulo
----------------------------------------------------------------------
diff --git a/bin/accumulo b/bin/accumulo
index 2ad8720..75ba63f 100755
--- a/bin/accumulo
+++ b/bin/accumulo
@@ -45,8 +45,8 @@ locationByProgram()
RESULT="$(readlink "${RESULT}")"
[[ "${RESULT}" != /* ]] && RESULT="${DIR}/${RESULT}" # if $RESULT was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done
- # find the relative home directory
- RESULT=$(dirname "${RESULT}")
+ # find the relative home directory, accounting for an extra bin directory
+ RESULT=$(dirname $(dirname "${RESULT}") )
echo "Auto-set ${2} to '${RESULT}'. To suppress this message, set ${2} in conf/accumulo-env.sh"
eval "${2}=${RESULT}"
}