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 2018/07/27 13:20:53 UTC
[35/50] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Conflicts:
gremlin-test/features/map/Select.feature
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/445a8bf0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/445a8bf0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/445a8bf0
Branch: refs/heads/TINKERPOP-1967
Commit: 445a8bf0b75f8f6ee246c5bd9277f0e902db246c
Parents: 5eaf312 3be3550
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 25 12:25:51 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 25 12:25:51 2018 -0400
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 3 +--
.../Gherkin/IgnoreException.cs | 3 ---
.../gremlin-javascript/test/cucumber/feature-steps.js | 3 +--
gremlin-python/src/main/jython/radish/feature_steps.py | 2 +-
gremlin-test/features/map/Select.feature | 13 +++++--------
5 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/445a8bf0/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/445a8bf0/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/445a8bf0/gremlin-test/features/map/Select.feature
----------------------------------------------------------------------