Merge branch 'TINKERPOP-1679' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9a33651a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9a33651a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9a33651a Branch: refs/heads/TINKERPOP-1489 Commit: 9a33651a7e65cb22ec0cb3775ef6419d4336b509 Parents: a7e0e0f 2e11e99 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Mon Jul 24 13:35:25 2017 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Mon Jul 24 13:35:25 2017 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 + .../gremlin/process/remote/RemoteGraph.java | 8 --- .../process/traversal/step/map/AddEdgeStep.java | 18 +++-- .../traversal/step/map/GroovyAddEdgeTest.groovy | 8 +++ .../gremlin_python/structure/io/graphson.py | 51 +++++++++++++-- .../driver/test_driver_remote_connection.py | 19 +++++- .../jython/tests/structure/io/test_graphson.py | 69 +++++++++++++------- .../process/traversal/step/map/AddEdgeTest.java | 25 +++++++ 8 files changed, 154 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a33651a/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --cc CHANGELOG.asciidoc index 9039d9f,d2d1447..62f4fe8 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -28,7 -28,8 +28,9 @@@ TinkerPop 3.2.6 (Release Date: NOT OFFI This release also includes changes from <<release-3-1-8, 3.1.8>>. +* Exceptions that occur during result iteration in Gremlin Server will now return `SCRIPT_EVALUATION_EXCEPTION` rather than `SERVER_ERROR`. + * `AddEdgeStep` attaches detached vertices prior to edge creation. + * Added graph element GraphSON serializers in Gremlin-Python. * Initialization scripts for Gremlin Server will not timeout. * Added Gremlin.Net. * `ProfileTest` is now less stringent about assertions which will reduce burdens on providers.