[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-08-21 Thread twilmes
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5357bf6a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5357bf6a Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-08-18 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fa2eebca Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fa2eebca Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-07-31 Thread dkuppitz
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f02fab9c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f02fab9c Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-07-26 Thread dkuppitz
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d92dd5d3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d92dd5d3 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-07-05 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e12cc7c8 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e12cc7c8 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-06-27 Thread okram
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/94365853 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/94365853 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-06-05 Thread twilmes
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e00b5d49 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e00b5d49 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-06-03 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b2ef0d43 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b2ef0d43 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-06-02 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/843f7814 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/843f7814 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-05-31 Thread rdale
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd398c70 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd398c70 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-05-22 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/afa3432e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/afa3432e Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-05-11 Thread rdale
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/37e17165 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/37e17165 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-05-11 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f3eada14 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f3eada14 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-05-11 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02b0e12f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02b0e12f Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-05-03 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f228c918 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f228c918 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-05-03 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/feffe794 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/feffe794 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-05-03 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cac7f6f9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cac7f6f9 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-04-27 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/60ad862e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/60ad862e Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-04-27 Thread rdale
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1f1faf4b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1f1faf4b Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-04-24 Thread rdale
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/273ad2c8 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/273ad2c8 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-04-20 Thread rdale
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4c6d8a01 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4c6d8a01 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-03-30 Thread rdale
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46976bb1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/46976bb1 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-03-29 Thread rdale
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aa5c4eea Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aa5c4eea Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-03-29 Thread rdale
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0fd2666a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0fd2666a Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-03-29 Thread rdale
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bb9e0814 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bb9e0814 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-03-27 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/77ef86b0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/77ef86b0 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-03-15 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/99ad76d0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/99ad76d0 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2017-02-14 Thread spmallette
Merge branch 'tp31' into tp32 Conflicts: giraph-gremlin/pom.xml gremlin-archetype/gremlin-archetype-server/pom.xml gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml gremlin-archetype/pom.xml gremlin-console/bin/gremlin.sh

[2/2] tinkerpop git commit: Merge branch 'tp31' of https://github.com/apache/tinkerpop into tp31

2017-01-23 Thread spmallette
Merge branch 'tp31' of https://github.com/apache/tinkerpop into tp31 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c279fab4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c279fab4 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2016-12-21 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/94c35a0f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/94c35a0f Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2016-11-20 Thread rdale
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/47d72ffc Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/47d72ffc Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2016-11-17 Thread rdale
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/35364c85 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/35364c85 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2016-11-15 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02f16640 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02f16640 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2016-11-03 Thread spmallette
Merge branch 'tp31' into tp32 Conflicts: gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9e284f7e Tree:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2016-11-02 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c2a51b1b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c2a51b1b Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2016-10-28 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/630c1ff0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/630c1ff0 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2016-10-26 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5a16f4c8 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5a16f4c8 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2016-10-26 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/16c7c244 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/16c7c244 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2016-10-25 Thread dkuppitz
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/487b3bf1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/487b3bf1 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2016-10-24 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7bb0c90a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7bb0c90a Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32

2016-10-21 Thread spmallette
Merge branch 'tp31' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1148e82a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1148e82a Diff:

[2/2] tinkerpop git commit: Merge branch 'tp31'

2016-09-21 Thread dkuppitz
Merge branch 'tp31' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/01d035ef Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/01d035ef Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/01d035ef

[2/2] tinkerpop git commit: Merge branch 'tp31'

2016-09-02 Thread spmallette
Merge branch 'tp31' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b9030962 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b9030962 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b9030962