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/10/21 14:22:31 UTC
[8/8] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30'
Merge remote-tracking branch 'origin/tp30'
Conflicts:
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
tinkergraph-gremlin/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a1d4f19c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a1d4f19c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a1d4f19c
Branch: refs/heads/master
Commit: a1d4f19c86636f5627569d334eebcd4e53965175
Parents: 17d4489 420de5c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Oct 21 08:22:12 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Oct 21 08:22:12 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 28 ++++++++++++++++++--
.../upgrade-release-3.0.x-incubating.asciidoc | 4 +--
2 files changed, 28 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a1d4f19c/CHANGELOG.asciidoc
----------------------------------------------------------------------