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 2017/06/23 12:52:26 UTC
[11/26] tinkerpop git commit: Merge branch 'TINKERPOP-1550'
Merge branch 'TINKERPOP-1550'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/391c2f92
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/391c2f92
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/391c2f92
Branch: refs/heads/TINKERPOP-1698
Commit: 391c2f923a4c55bd30e2fd5d7ff314ad502ec6f3
Parents: eaf34b8 945c235
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 22 19:04:56 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 22 19:04:56 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 20 +++++++++----
docs/src/upgrade/release-3.3.x.asciidoc | 9 ++++++
gremlin-server/pom.xml | 2 ++
gremlin-server/src/assembly/standalone.xml | 19 ++++++------
.../tinkerpop/gremlin/server/GremlinServer.java | 2 +-
.../tinkerpop/gremlin/server/Settings.java | 14 +--------
.../gremlin/server/util/MetricManager.java | 13 ++++++--
gremlin-server/src/main/static/LICENSE | 4 ---
.../src/main/static/licenses/gmetric4j | 31 --------------------
pom.xml | 2 ++
11 files changed, 50 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/391c2f92/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/391c2f92/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/391c2f92/gremlin-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/391c2f92/pom.xml
----------------------------------------------------------------------