Merge branch 'master' into TINKERPOP-1278
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0ce35b63 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0ce35b63 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0ce35b63 Branch: refs/heads/TINKERPOP-1278 Commit: 0ce35b6374409e97bb6ec203e182396d461799bc Parents: c34fe9f c0b0eed Author: Marko A. Rodriguez <[email protected]> Authored: Sat Jul 2 07:37:00 2016 -0600 Committer: Marko A. Rodriguez <[email protected]> Committed: Sat Jul 2 07:37:00 2016 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../gremlin/groovy/engine/GremlinExecutor.java | 2 +- .../structure/io/gryo/GryoRegistrator.java | 5 +++ .../step/sideEffect/TinkerGraphStep.java | 15 +++---- .../tinkergraph/structure/TinkerGraph.java | 44 +++++++++++--------- 5 files changed, 40 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
