You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by tw...@apache.org on 2016/03/30 19:48:01 UTC

[1/2] incubator-tinkerpop git commit: CTR: Added space to awk variable definition to make compatible with OS x bundled awk.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master a825a816e -> 5177109be


CTR: Added space to awk variable definition to make compatible with OS x bundled awk.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1128dc31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1128dc31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1128dc31

Branch: refs/heads/master
Commit: 1128dc3188b0ecf3f7b55e93f82b2e7e5d146a9f
Parents: f165ea3
Author: Ted Wilmes <tw...@gmail.com>
Authored: Wed Mar 30 12:46:01 2016 -0500
Committer: Ted Wilmes <tw...@gmail.com>
Committed: Wed Mar 30 12:46:01 2016 -0500

----------------------------------------------------------------------
 gremlin-console/src/main/bin/gremlin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1128dc31/gremlin-console/src/main/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/bin/gremlin.sh b/gremlin-console/src/main/bin/gremlin.sh
index f6e8051..84ba8179 100755
--- a/gremlin-console/src/main/bin/gremlin.sh
+++ b/gremlin-console/src/main/bin/gremlin.sh
@@ -100,7 +100,7 @@ done
 shift $(( $OPTIND - 1 ))
 
 JAVA_OPTIONS="${JAVA_OPTIONS} -Dtinkerpop.ext=${USER_EXT_DIR:-${SYSTEM_EXT_DIR}} -Dlog4j.configuration=conf/log4j-console.properties -Dgremlin.log4j.level=$GREMLIN_LOG_LEVEL"
-JAVA_OPTIONS=$(awk -vRS=' ' '!/^$/ {if (!x[$0]++) print}' <<< "${JAVA_OPTIONS}" | grep -v '^$' | paste -sd ' ' -)
+JAVA_OPTIONS=$(awk -v RS=' ' '!/^$/ {if (!x[$0]++) print}' <<< "${JAVA_OPTIONS}" | grep -v '^$' | paste -sd ' ' -)
 
 if [ -n "$SCRIPT_DEBUG" ]; then
     echo "CLASSPATH: $CLASSPATH"


[2/2] incubator-tinkerpop git commit: Merge branch 'tp31'

Posted by tw...@apache.org.
Merge branch 'tp31'


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/5177109b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/5177109b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/5177109b

Branch: refs/heads/master
Commit: 5177109bed771ae49034f4d50f2dfe80a80d84e4
Parents: a825a81 1128dc3
Author: Ted Wilmes <tw...@gmail.com>
Authored: Wed Mar 30 12:46:35 2016 -0500
Committer: Ted Wilmes <tw...@gmail.com>
Committed: Wed Mar 30 12:46:35 2016 -0500

----------------------------------------------------------------------
 gremlin-console/src/main/bin/gremlin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------