[23/50] [abbrv] tinkerpop git commit: Merge branch 'tp33'

2018-09-18 Thread spmallette
Merge branch 'tp33'

Conflicts:

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java


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

Branch: refs/heads/TINKERPOP-1913
Commit: e914a670f0f169d0abff50363d510384ca57badf
Parents: 9143ffd 0eeeb0d
Author: Stephen Mallette 
Authored: Wed Sep 12 11:58:00 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 12 11:58:00 2018 -0400

--
 CHANGELOG.asciidoc|  2 ++
 .../gremlin/structure/io/gryo/GryoVersion.java| 12 +++-
 .../structure/io/gryo/UtilSerializers.java| 18 ++
 3 files changed, 31 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e914a670/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e914a670/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
--



[23/50] [abbrv] tinkerpop git commit: Merge branch 'tp33'

2018-07-29 Thread dkuppitz
Merge branch 'tp33'


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

Branch: refs/heads/TINKERPOP-1990
Commit: dbbe4482ff5b7b892d68528eb5070cb8ca91b834
Parents: e1e15fa ebee26c
Author: Stephen Mallette 
Authored: Wed Jul 25 07:43:53 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jul 25 07:43:53 2018 -0400

--
 docs/src/reference/gremlin-variants.asciidoc | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dbbe4482/docs/src/reference/gremlin-variants.asciidoc
--



[23/50] [abbrv] tinkerpop git commit: Merge branch 'tp33'

2018-04-06 Thread spmallette
Merge branch 'tp33'


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

Branch: refs/heads/tp33
Commit: fc18e3ebc527db24327cbe0b3f0842e7c807c575
Parents: 8b17ab7 10dc80a
Author: Stephen Mallette 
Authored: Tue Mar 20 12:06:18 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 12:06:18 2018 -0400

--

--