[02/15] tinkerpop git commit: Merge branch 'tp32'

[spmallette]

Merge branch 'tp32'


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

Branch: refs/heads/TINKERPOP-1612-wip
Commit: 7b3adca394a765f18010d98a5420ada36c155a61
Parents: f242289 c958b22
Author: Stephen Mallette 
Authored: Thu Jan 26 14:47:20 2017 -0500
Committer: Stephen Mallette 
Committed: Thu Jan 26 14:47:20 2017 -0500

--
 .../gremlin/jsr223/BindingsCustomizer.java  | 11 ++-
 .../gremlin/jsr223/BindingsGremlinPlugin.java   | 48 --
 .../jsr223/DefaultBindingsCustomizer.java   | 20 -
 .../DefaultGremlinScriptEngineManager.java  | 16 +++-
 .../gremlin/jsr223/LazyBindingsCustomizer.java  | 20 +
 .../gremlin/jsr223/ScriptFileGremlinPlugin.java |  4 +-
 .../jsr223/BindingsScriptEngineTest.java| 95 
 .../jsr223/GremlinScriptEngineSuite.java|  1 +
 8 files changed, 206 insertions(+), 9 deletions(-)
--

[02/15] tinkerpop git commit: Merge branch 'tp32'

[spmallette]

Merge branch 'tp32'


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

Branch: refs/heads/TINKERPOP-1612-wip
Commit: f242289a81561c085220a0b4b170ec2b1fc69f43
Parents: 0427370 91759a5
Author: Stephen Mallette 
Authored: Thu Jan 26 10:37:51 2017 -0500
Committer: Stephen Mallette 
Committed: Thu Jan 26 10:37:51 2017 -0500

--
 .../services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin  | 1 +
 1 file changed, 1 insertion(+)
--

[02/15] tinkerpop git commit: Merge branch 'tp32'

[spmallette]

Merge branch 'tp32'


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

Branch: refs/heads/TINKERPOP-1565
Commit: d1f08894110cb4c429e6c5230ffb93fd5c4e3d7a
Parents: dc31f2d 97cc07d
Author: Stephen Mallette 
Authored: Wed Jan 18 13:23:08 2017 -0500
Committer: Stephen Mallette 
Committed: Wed Jan 18 13:23:08 2017 -0500

--
 .../structure/io/graphson/GraphSONModule.java   |  30 +-
 .../GraphSONTraversalSerializersV2d0.java   | 390 ---
 .../io/graphson/TraversalSerializersV2d0.java   | 390 +++
 3 files changed, 405 insertions(+), 405 deletions(-)
--