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/05/08 18:21:38 UTC
[5/5] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33'
Conflicts:
giraph-gremlin/pom.xml
gremlin-archetype/gremlin-archetype-dsl/pom.xml
gremlin-archetype/gremlin-archetype-server/pom.xml
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
gremlin-archetype/pom.xml
gremlin-console/bin/gremlin.sh
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-dotnet/pom.xml
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
gremlin-dotnet/src/pom.xml
gremlin-dotnet/test/pom.xml
gremlin-driver/pom.xml
gremlin-groovy/pom.xml
gremlin-javascript/pom.xml
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
gremlin-python/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
gremlin-tools/gremlin-benchmark/pom.xml
gremlin-tools/gremlin-coverage/pom.xml
gremlin-tools/gremlin-io-test/pom.xml
gremlin-tools/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
spark-gremlin/pom.xml
tinkergraph-gremlin/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bf77d6d1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bf77d6d1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bf77d6d1
Branch: refs/heads/master
Commit: bf77d6d1bdd7d81dc0215addaf4fefc304367f99
Parents: 1818c89 2d39f9b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 8 14:21:19 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 8 14:21:19 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 38 ++++++++++++++++++--
.../upgrade/release-3.2.x-incubating.asciidoc | 4 +--
docs/src/upgrade/release-3.3.x.asciidoc | 2 +-
3 files changed, 39 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf77d6d1/CHANGELOG.asciidoc
----------------------------------------------------------------------