You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/06/30 17:56:08 UTC
[06/10] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master' into resultset-refactor
Merge remote-tracking branch 'origin/master' into resultset-refactor
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a1c8972d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a1c8972d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a1c8972d
Branch: refs/heads/master
Commit: a1c8972d51d2a7325fd4d97b8057d3e4cd046674
Parents: 382ccbf 87e4e77
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 29 07:17:35 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 29 07:17:35 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
bin/gephi-mock.py | 48 +++++++++++++++++
bin/gephi.mock | 24 ---------
bin/process-docs.sh | 18 ++++++-
docs/src/gremlin-applications.asciidoc | 5 +-
docs/src/the-traversal.asciidoc | 57 +++++++++++++++++++-
gremlin-console/pom.xml | 2 +-
.../GephiRemoteAcceptorIntegrateTest.java | 17 +++++-
.../tinkerpop/gremlin/structure/Graph.java | 2 +-
.../gremlin/structure/Transaction.java | 8 ++-
.../structure/util/AbstractTransaction.java | 4 +-
.../driver/util/ProfilingApplication.java | 15 ++++--
.../gremlin/structure/FeatureSupportTest.java | 2 +-
.../gremlin/structure/TransactionTest.java | 2 +-
14 files changed, 159 insertions(+), 46 deletions(-)
----------------------------------------------------------------------