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/03 16:22:19 UTC

[2/3] incubator-tinkerpop git commit: Merge branch 'master' into TINKERPOP-1279

Merge branch 'master' into TINKERPOP-1279


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6f3026a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6f3026a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6f3026a2

Branch: refs/heads/master
Commit: 6f3026a26206d16ee73a7d5a7d009457b5ee02c6
Parents: 444778b a117232
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue May 3 08:19:38 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue May 3 08:19:38 2016 -0600

----------------------------------------------------------------------
 .dockerignore                                   |   1 -
 CHANGELOG.asciidoc                              |   6 +
 docker/scripts/build.sh                         |   2 +-
 .../src/reference/gremlin-applications.asciidoc |  66 ++++++--
 .../the-gremlin-console/index.asciidoc          |  11 +-
 .../upgrade/release-3.2.x-incubating.asciidoc   |  41 +++++
 gremlin-console/pom.xml                         |   5 +
 gremlin-console/src/main/bin/gremlin.bat        |  41 +----
 gremlin-console/src/main/bin/gremlin.sh         |  19 +--
 .../tinkerpop/gremlin/console/Console.groovy    | 168 +++++++++++++++----
 .../gremlin/groovy/jsr223/ScriptExecutor.java   |   2 +
 11 files changed, 253 insertions(+), 109 deletions(-)
----------------------------------------------------------------------