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:
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:
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:
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-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
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
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
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:
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:
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
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
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:
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
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:
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:
15 matches
Mail list logo