[1/7] tinkerpop git commit: Aligned versions in io tests better [Forced Update!]

2018-09-12 Thread spmallette
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-2033 410e6d5a7 -> 8761118aa (forced update) Aligned versions in io tests better Not sure why the versions were off. Luckily it was of little consequence beause those serializers didn't really change. CTR Project:

[5/7] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-09-12 Thread spmallette
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0eeeb0d0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0eeeb0d0 Diff:

[3/7] tinkerpop git commit: Removed duplicate dep - CTR

2018-09-12 Thread spmallette
Removed duplicate dep - CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9143ffd3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9143ffd3 Diff:

[6/7] tinkerpop git commit: Merge branch 'tp33'

2018-09-12 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:

[4/7] tinkerpop git commit: TINKERPOP-2034 Registered synchronizedMap() with Gryo CTR

2018-09-12 Thread spmallette
TINKERPOP-2034 Registered synchronizedMap() with Gryo CTR This has no real effect here, but is relevant to continued compatibility with Gryo 1.0 in 3.4.0. Also added Triplet to Gryo as it was added in 3.4.0 as part of repeat() CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo

[2/7] tinkerpop git commit: Merge branch 'tp33'

2018-09-12 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/76cb2b60 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/76cb2b60 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/76cb2b60

[7/7] tinkerpop git commit: TINKERPOP-2033 Maintain order in profile() annotations

2018-09-12 Thread spmallette
TINKERPOP-2033 Maintain order in profile() annotations Used a synchronized map around a LinkedHashMap rather than ConcurrentHashMap. Not expecting a performance issue with this as its for profile() step which doesn't have to be "fast" per se as it is a debugging step. Affected gryo more than

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

2018-09-12 Thread spmallette
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0eeeb0d0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0eeeb0d0 Diff:

[3/3] tinkerpop git commit: Merge branch 'tp33'

2018-09-12 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:

tinkerpop git commit: TINKERPOP-2034 Registered synchronizedMap() with Gryo CTR

2018-09-12 Thread spmallette
Repository: tinkerpop Updated Branches: refs/heads/tp32 c029eef8e -> ec0e6856e TINKERPOP-2034 Registered synchronizedMap() with Gryo CTR This has no real effect here, but is relevant to continued compatibility with Gryo 1.0 in 3.4.0. Also added Triplet to Gryo as it was added in 3.4.0 as

[1/3] tinkerpop git commit: TINKERPOP-2034 Registered synchronizedMap() with Gryo CTR

2018-09-12 Thread spmallette
Repository: tinkerpop Updated Branches: refs/heads/master 9143ffd36 -> e914a670f TINKERPOP-2034 Registered synchronizedMap() with Gryo CTR This has no real effect here, but is relevant to continued compatibility with Gryo 1.0 in 3.4.0. Also added Triplet to Gryo as it was added in 3.4.0 as

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

2018-09-12 Thread spmallette
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0eeeb0d0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0eeeb0d0 Diff:

tinkerpop git commit: TINKERPOP-2033 Maintain order in profile() annotations

2018-09-12 Thread spmallette
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-2033 [created] 410e6d5a7 TINKERPOP-2033 Maintain order in profile() annotations Used a synchronized map around a LinkedHashMap rather than ConcurrentHashMap. Not expecting a performance issue with this as its for profile() step

tinkerpop git commit: Removed duplicate dep - CTR

2018-09-12 Thread rdale
Repository: tinkerpop Updated Branches: refs/heads/master 76cb2b602 -> 9143ffd36 Removed duplicate dep - CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9143ffd3 Tree:

tinkerpop git commit: TINKERPOP-1972 Fix test harness, extract child type in generic params array

2018-09-12 Thread jorgebg
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1972 [created] 2a2e47ebd TINKERPOP-1972 Fix test harness, extract child type in generic params array Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: