Merge branch 'tp32' into tp33
Conflicts:
docs/src/reference/gremlin-applications.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c790459d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c790459d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c790459d
Branch: refs/heads/tp33
Commit: c790459dd0b352839c10e987b459579c13e4b7e3
Parents: d4c76a6 2495e8e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 18 09:26:00 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 18 09:26:00 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 ++-
docs/src/reference/gremlin-applications.asciidoc | 2 +-
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 8 ++++++++
.../gremlin/groovy/jsr223/GroovyCompilerGremlinPlugin.java | 7 +++++++
4 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c790459d/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c790459d/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c790459d/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
