accumulo git commit: ACCUMULO-2232 Added options to Combiner for handling deletes

2015-10-02 Thread kturner
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:

[2/2] accumulo git commit: Merge branch '1.6' into 1.7

2015-10-02 Thread kturner
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:

[1/2] accumulo git commit: ACCUMULO-2232 Added options to Combiner for handling deletes

2015-10-02 Thread kturner
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:

[3/7] accumulo git commit: Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6

2015-10-02 Thread ecn
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:

[1/7] accumulo git commit: ACCUMULO-4016 use object reference equality to remove the minimum object queued

2015-10-02 Thread ecn
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:

[1/2] accumulo git commit: Merge branch '1.7'

2015-10-02 Thread ecn
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:

[1/2] accumulo git commit: ACCUMULO-4016 use object reference equality to remove the minimum object queued

2015-10-02 Thread ecn
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

[2/2] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

2015-10-02 Thread ecn
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:

[1/2] accumulo git commit: ACCUMULO-3462 use object reference equality to remove the minimum object queued

2015-10-02 Thread ecn
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

[5/5] accumulo git commit: Merge branch '1.7'

2015-10-02 Thread ecn
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

[1/5] accumulo git commit: ACCUMULO-2232 Added options to Combiner for handling deletes

2015-10-02 Thread ecn
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:

[3/5] accumulo git commit: ACCUMULO-3462 use object reference equality to remove the minimum object queued

2015-10-02 Thread ecn
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:

accumulo git commit: ACCUMULO-4016 wrapper classes should forward to underlying methods

2015-10-02 Thread ecn
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:

[3/4] accumulo git commit: ACCUMULO-4016 wrapper classes should forward to underlying methods

2015-10-02 Thread ecn
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:

[2/2] accumulo git commit: ACCUMULO-3462 use object reference equality to remove the minimum object queued

2015-10-02 Thread ecn
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:

[4/5] accumulo git commit: ACCUMULO-3462 use object reference equality to remove the minimum object queued

2015-10-02 Thread ecn
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:

[2/5] accumulo git commit: Merge branch '1.6' into 1.7

2015-10-02 Thread ecn
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:

[2/2] accumulo git commit: Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6

2015-10-02 Thread ecn
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:

[1/2] accumulo git commit: ACCUMULO-4016 use object reference equality to remove the minimum object queued

2015-10-02 Thread ecn
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

[4/7] accumulo git commit: Merge branch '1.7' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.7

2015-10-02 Thread ecn
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:

[4/4] accumulo git commit: ACCUMULO-4016 resolve conflict

2015-10-02 Thread ecn
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:

[6/7] accumulo git commit: ACCUMULO-4016 resolve conflict

2015-10-02 Thread ecn
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:

[1/4] accumulo git commit: ACCUMULO-4016 use object reference equality to remove the minimum object queued

2015-10-02 Thread ecn
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

[5/7] accumulo git commit: ACCUMULO-4016 wrapper classes should forward to underlying methods

2015-10-02 Thread ecn
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:

[2/7] accumulo git commit: ACCUMULO-4016 use object reference equality to remove the minimum object queued

2015-10-02 Thread ecn
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:

[1/4] accumulo git commit: ACCUMULO-2232 fix since version

2015-10-02 Thread kturner
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:

[3/4] accumulo git commit: Merge branch '1.7'

2015-10-02 Thread kturner
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

[2/4] accumulo git commit: Merge branch '1.6' into 1.7

2015-10-02 Thread kturner
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:

[2/2] accumulo git commit: Merge branch '1.6' into 1.7

2015-10-02 Thread kturner
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:

accumulo git commit: ACCUMULO-2232 fix since version

2015-10-02 Thread kturner
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:

[1/2] accumulo git commit: ACCUMULO-2232 fix since version

2015-10-02 Thread kturner
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:

[4/4] accumulo git commit: ACCUMULO-2232 Fix test

2015-10-02 Thread kturner
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