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/09/16 19:44:02 UTC
[5/5] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30'
Merge remote-tracking branch 'origin/tp30'
Conflicts:
gremlin-console/src/main/NOTICE
gremlin-server/src/main/NOTICE
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cf6c455b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cf6c455b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cf6c455b
Branch: refs/heads/master
Commit: cf6c455bb3a0c7ebedb1cc6d4d6c89b3010f6357
Parents: c3553f7 961388e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 16 13:43:19 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 16 13:43:19 2015 -0400
----------------------------------------------------------------------
RELEASE.asciidoc | 5 ++-
gremlin-console/src/main/NOTICE | 76 +++---------------------------------
gremlin-server/src/main/NOTICE | 73 +++-------------------------------
3 files changed, 14 insertions(+), 140 deletions(-)
----------------------------------------------------------------------