Merge branch 'TINKERPOP-1440'

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

Branch: refs/heads/TINKERPOP-1280
Commit: d659e15beb7366bf8ca555e0e4e4ab6f88b9dbeb
Parents: a879702 9050ad1
Author: Marko A. Rodriguez <okramma...@gmail.com>
Authored: Tue Sep 13 09:03:50 2016 -0600
Committer: Marko A. Rodriguez <okramma...@gmail.com>
Committed: Tue Sep 13 09:03:50 2016 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 docs/src/reference/gremlin-variants.asciidoc    | 12 +++---
 docs/src/reference/intro.asciidoc               | 14 +++----
 .../jython/gremlin_python/structure/graph.py    | 32 ++++++++++++++
 .../gremlin_python/structure/io/graphson.py     | 16 ++++++-
 .../jython/tests/structure/io/test_graphson.py  | 13 ++++++
 .../main/jython/tests/structure/test_graph.py   | 44 +++++++++++++++++++-
 7 files changed, 117 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


Reply via email to