You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/05/10 13:33:52 UTC
[13/13] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP-1293
Merge branch 'master' into TINKERPOP-1293
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b123cbef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b123cbef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b123cbef
Branch: refs/heads/TINKERPOP-1293
Commit: b123cbef14674caff40f2370caeeb4462017975c
Parents: c6238c0 9159fe7
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue May 10 07:33:28 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue May 10 07:33:28 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +++
.../upgrade/release-3.2.x-incubating.asciidoc | 4 ++++
gremlin-console/src/main/static/LICENSE | 8 ++++----
.../tinkerpop/gremlin/driver/Connection.java | 20 +++++++++++--------
.../loaders/SugarLoaderPerformanceTest.groovy | 2 ++
.../traversal/step/map/GroovyOrderTest.groovy | 4 ++--
.../GroovyEnvironmentPerformanceSuite.java | 2 ++
.../engine/GremlinExecutorPerformanceTest.java | 2 ++
gremlin-server/src/main/static/LICENSE | 8 ++++----
.../server/GremlinDriverIntegrateTest.java | 21 ++++++++++++++++++++
.../process/traversal/step/map/OrderTest.java | 4 ++--
pom.xml | 2 +-
.../TinkerGraphProcessPerformanceTest.java | 2 ++
.../TinkerGraphStructurePerformanceTest.java | 2 ++
...erGraphGroovyEnvironmentPerformanceTest.java | 2 ++
15 files changed, 65 insertions(+), 21 deletions(-)
----------------------------------------------------------------------