Repository: accumulo
Updated Branches:
refs/heads/1.6 e24bd3672 -> 7a1d6d921
ACCUMULO-2232 Added options to Combiner for handling deletes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a1d6d92
Tree:
Merge branch '1.6' into 1.7
Conflicts:
core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f50db38f
Tree:
Repository: accumulo
Updated Branches:
refs/heads/1.7 38f36e26e -> f50db38f7
ACCUMULO-2232 Added options to Combiner for handling deletes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a1d6d92
Tree:
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a922ed79
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a922ed79
Diff:
Repository: accumulo
Updated Branches:
refs/heads/master 8f6ab6d3e -> 49b44e4eb
ACCUMULO-4016 use object reference equality to remove the minimum object queued
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit:
Repository: accumulo
Updated Branches:
refs/heads/master 17ae2f919 -> 8f6ab6d3e
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32907df8
Tree:
Repository: accumulo
Updated Branches:
refs/heads/1.6 4b5ea5355 -> a922ed791
ACCUMULO-4016 use object reference equality to remove the minimum object queued
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fbb082d9
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f6ab6d3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f6ab6d3
Diff:
Repository: accumulo
Updated Branches:
refs/heads/1.7 f50db38f7 -> 0013e46e6
ACCUMULO-3462 use object reference equality to remove the minimum object queued
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4b5ea535
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/17ae2f91
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17ae2f91
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17ae2f91
Repository: accumulo
Updated Branches:
refs/heads/master 18e834ec2 -> 17ae2f919
ACCUMULO-2232 Added options to Combiner for handling deletes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a1d6d92
Tree:
ACCUMULO-3462 use object reference equality to remove the minimum object queued
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4b5ea535
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b5ea535
Diff:
Repository: accumulo
Updated Branches:
refs/heads/1.6 a922ed791 -> a39b3f6be
ACCUMULO-4016 wrapper classes should forward to underlying methods
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a39b3f6b
Tree:
ACCUMULO-4016 wrapper classes should forward to underlying methods
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a39b3f6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a39b3f6b
Diff:
ACCUMULO-3462 use object reference equality to remove the minimum object queued
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0013e46e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0013e46e
Diff:
ACCUMULO-3462 use object reference equality to remove the minimum object queued
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0013e46e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0013e46e
Diff:
Merge branch '1.6' into 1.7
Conflicts:
core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f50db38f
Tree:
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a922ed79
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a922ed79
Diff:
Repository: accumulo
Updated Branches:
refs/heads/1.7 0013e46e6 -> 01234bef3
ACCUMULO-4016 use object reference equality to remove the minimum object queued
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/747a1901
Merge branch '1.7' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/01234bef
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/01234bef
Diff:
ACCUMULO-4016 resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4623103e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4623103e
Diff:
ACCUMULO-4016 resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4623103e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4623103e
Diff:
Repository: accumulo
Updated Branches:
refs/heads/1.7 01234bef3 -> 4623103e2
ACCUMULO-4016 use object reference equality to remove the minimum object queued
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fbb082d9
ACCUMULO-4016 wrapper classes should forward to underlying methods
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a39b3f6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a39b3f6b
Diff:
ACCUMULO-4016 use object reference equality to remove the minimum object queued
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/747a1901
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/747a1901
Diff:
Repository: accumulo
Updated Branches:
refs/heads/master 49b44e4eb -> 445f3fe1d
ACCUMULO-2232 fix since version
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f3203854
Tree:
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3444ef7c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3444ef7c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3444ef7c
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/713282a0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/713282a0
Diff:
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/713282a0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/713282a0
Diff:
Repository: accumulo
Updated Branches:
refs/heads/1.6 a39b3f6be -> f32038544
ACCUMULO-2232 fix since version
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f3203854
Tree:
Repository: accumulo
Updated Branches:
refs/heads/1.7 4623103e2 -> 713282a0e
ACCUMULO-2232 fix since version
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f3203854
Tree:
ACCUMULO-2232 Fix test
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/445f3fe1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/445f3fe1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/445f3fe1
32 matches
Mail list logo