Merge branch 'tp32' into tp33
Conflicts:
gremlin-server/src/main/bin/gremlin-server.bat
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a050b6ed
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a050b6ed
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a050b6ed
Branch: refs/heads/tp33
Commit: a050b6ed6380b1b97462739a75c6104f4e6e1b32
Parents: 5e48acc 00cb9a8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Aug 10 14:03:06 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Aug 10 14:03:06 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
gremlin-server/src/main/bin/gremlin-server.bat | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a050b6ed/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a050b6ed/gremlin-server/src/main/bin/gremlin-server.bat
----------------------------------------------------------------------
diff --cc gremlin-server/src/main/bin/gremlin-server.bat
index 8ceab26,cf8e916..6c73f48
--- a/gremlin-server/src/main/bin/gremlin-server.bat
+++ b/gremlin-server/src/main/bin/gremlin-server.bat
@@@ -42,13 -41,8 +42,13 @@@ if "%1" == "install" goto instal
:server
:: Launch the application
- java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS%
%JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%;
org.apache.tinkerpop.gremlin.server.GremlinServer %*
+ java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS%
%JAVA_ARGS% -cp "%LIBDIR%/*;%EXTDIR%;"
org.apache.tinkerpop.gremlin.server.GremlinServer %*
+:dashi
+
+echo NOTE: -i is deprecated. Please update your scripts. Using 'install'
command...
+goto install
+
:install
set RESTVAR=
@@@ -61,4 -55,4 +61,4 @@@ goto loop
:after_loop
- java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS%
%JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%;
org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR%
-java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS%
%JAVA_ARGS% -cp "%LIBDIR%/*;%EXTDIR%;"
org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR%
++java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS%
%JAVA_ARGS% -cp "%LIBDIR%/*;%EXTDIR%;"
org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR%
