tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [3/3] tinkerpop git commit: Merge branch 'tp32'
Date Fri, 14 Jul 2017 16:05:04 GMT
Merge branch 'tp32'

Conflicts:
	gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProfileTest.java


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

Branch: refs/heads/master
Commit: 1de84f8740d83b3752d649ab411fda1386e478cb
Parents: 4f7b563 04d4e90
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Fri Jul 14 12:04:49 2017 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Fri Jul 14 12:04:49 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../process/traversal/step/map/ProfileTest.java | 34 +++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1de84f87/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1de84f87/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProfileTest.java
----------------------------------------------------------------------


Mime
View raw message