Merge branch 'tp32' Conflicts: gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5f865270 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5f865270 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5f865270 Branch: refs/heads/master Commit: 5f865270c07f8996f0ac38ca1726e24ca9cecf79 Parents: 122a460 51caf77 Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue Aug 8 17:13:39 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue Aug 8 17:13:39 2017 -0400 ---------------------------------------------------------------------- .../structure/io/graphson/GraphSONModule.java | 4 +- .../io/graphson/GraphSONSerializersV2d0.java | 10 +-- .../step/sideEffect/GroovySackTest.groovy | 89 ++++++++++++++++++++ 3 files changed, 96 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f865270/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f865270/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java ---------------------------------------------------------------------- diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java index 717dcfa,2ddb37a..6221e05 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java @@@ -703,4 -703,7 +703,4 @@@ class GraphSONSerializersV2d0 return true; } } - } + } - - -