tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [2/2] tinkerpop git commit: Merge branch 'pr-709' into tp32
Date Thu, 12 Oct 2017 16:47:26 GMT
Merge branch 'pr-709' into tp32

Conflicts:
	CHANGELOG.asciidoc


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

Branch: refs/heads/tp32
Commit: 021db56542f68dbd104ea7c8ed56c86aa50c3237
Parents: 1fa01ef 2a8c92f
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Thu Oct 12 12:46:51 2017 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Thu Oct 12 12:46:51 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                    |  3 ++-
 .../gremlin/groovy/engine/GremlinExecutor.java        | 14 +++++++++++++-
 .../gremlin/groovy/engine/GremlinExecutorTest.java    | 13 +++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/021db565/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 2f6069d,fe1da7a..d8fe716
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -43,10 -34,11 +43,11 @@@ image::https://raw.githubusercontent.co
  * Fixed a bug in `Neo4jGremlinPlugin` that prevented it from loading properly in the `GremlinPythonScriptEngine`.
  * Fixed a bug in `ComputerVerificationStrategy` where child traversals were being analyzed
prior to compilation.
  * Fixed a bug that prevented Gremlin from ordering lists and streams made of mixed number
types.
- * Fixed a bug where `keepLabels` were being corrupted because a defensive copy was not being
made when they were being set by `PathRetractionStrategy`. 
++* Fixed a bug where `keepLabels` were being corrupted because a defensive copy was not being
made when they were being set by `PathRetractionStrategy`.
+ * Cancel script evaluation timeout in `GremlinExecutor` when script evaluation finished.
  
  [[release-3-2-6]]
 -TinkerPop 3.2.6 (Release Date: August 21, 2017)
 -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +=== TinkerPop 3.2.6 (Release Date: August 21, 2017)
  
  This release also includes changes from <<release-3-1-8, 3.1.8>>.
  

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/021db565/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
----------------------------------------------------------------------


Mime
View raw message