Merge branch 'tp32'
Conflicts:
CHANGELOG.asciidoc
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a7ee024d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a7ee024d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a7ee024d
Branch: refs/heads/master
Commit: a7ee024d6e6a3c1ecdada2ac78c341b0340da08a
Parents: 751b6f5 7c72e51
Author: Stephen Mallette <[email protected]>
Authored: Tue Jul 18 12:45:04 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Tue Jul 18 12:45:04 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 ++
.../gremlin/groovy/engine/GremlinExecutor.java | 27 +++++++++-----------
.../server/util/ServerGremlinExecutor.java | 6 ++++-
3 files changed, 19 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a7ee024d/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 3085a2e,573f681..47668bb
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -137,9 -28,10 +137,11 @@@ TinkerPop 3.2.6 (Release Date: NOT OFFI
This release also includes changes from <<release-3-1-8, 3.1.8>>.
+ * Initialization scripts for Gremlin Server will not timeout.
+ * Added Gremlin.Net.
* `ProfileTest` is now less stringent about assertions which will reduce
burdens on providers.
* `GremlinExecutor` begins timeout of script evaluation at the time the
script was submitted and not from the time it began evaluation.
+* Added Gremlin.Net.
* `ReferenceFactory` and `DetachedFactory` now detach elements in collections
accordingly.
* Deprecated `GryoLiteMessageSerializerV1d0` in favor of
`HaltedTraverserStrategy`.
* Deprecated the `useMapperFromGraph` configuration option for Gremlin Server
serializers.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a7ee024d/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a7ee024d/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
----------------------------------------------------------------------
diff --cc
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
index 9bd58a0,b878549..e95b61a
---
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
+++
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
@@@ -29,8 -30,10 +29,9 @@@ import org.apache.tinkerpop.gremlin.str
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+ import javax.script.SimpleBindings;
import java.lang.reflect.Constructor;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
