Merge branch 'tp32'
Conflicts:
gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java
gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorIntegrateTest.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/63036540
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/63036540
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/63036540
Branch: refs/heads/master
Commit: 630365405176a9317b38aa81e185bd781b132602
Parents: a619eb9 a13f922
Author: Stephen Mallette <[email protected]>
Authored: Fri Sep 22 13:30:33 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Fri Sep 22 13:30:33 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/reference/gremlin-applications.asciidoc | 9 +++++++++
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++++++++++++++
.../console/jsr223/DriverRemoteAcceptor.java | 16 ++++++++++++++--
.../jsr223/DriverRemoteAcceptorIntegrateTest.java | 9 ++++++++-
5 files changed, 47 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63036540/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63036540/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63036540/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63036540/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
----------------------------------------------------------------------
