Merge remote-tracking branch 'origin/TINKERPOP-1063' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1c9bd087 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1c9bd087 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1c9bd087 Branch: refs/heads/TINKERPOP-1278 Commit: 1c9bd087d54a1f7a6506edacd34e07d713d15a04 Parents: d699cb6 1e0c581 Author: Stephen Mallette <[email protected]> Authored: Thu Jun 30 11:22:46 2016 -0400 Committer: Stephen Mallette <[email protected]> Committed: Thu Jun 30 11:22:46 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../step/sideEffect/TinkerGraphStep.java | 15 ++++--- .../tinkergraph/structure/TinkerGraph.java | 47 +++++++++++--------- 3 files changed, 35 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
