[tinkerpop] 02/02: Merge branch 'tp33'

[spmallette]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 8f9da19926d4affb4a06597a8bf5c349936c4f27
Merge: b850428 fb734ea
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Dec 21 08:00:25 2018 -0500

    Merge branch 'tp33'

 CHANGELOG.asciidoc                                                      | 1 +
 .../apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java  | 2 ++
 .../gremlin/structure/io/graphson/GraphSONSerializersV2d0.java          | 2 +-
 .../gremlin/structure/io/graphson/GraphSONSerializersV3d0.java          | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index e853cf4,876d6d2..844897d
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@@ -141,9 -138,9 +141,10 @@@ abstract class GraphSONModule extends T
                      put(VertexProperty.class, "VertexProperty");
                      put(Metrics.class, "Metrics");
                      put(TraversalMetrics.class, "TraversalMetrics");
+                     put(TraversalExplanation.class, "TraversalExplanation");
                      put(Traverser.class, "Traverser");
                      put(Tree.class, "Tree");
 +                    put(BulkSet.class, "BulkSet");
                      put(Bytecode.class, "Bytecode");
                      put(Bytecode.Binding.class, "Binding");
                      put(AndP.class, "P");