git commit: back up new sstables before creating a new View (which makes the new one eligible for compaction)

Updated Branches: refs/heads/cassandra-1.2 698fc4427 - 8a422179c back up new sstables before creating a new View (which makes the new one eligible for compaction) patch by jbellis, reviewed by marcuse for CASSANDRA-5410 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit

[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e37ca25c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e37ca25c Diff:

[1/2] git commit: back up new sstables before creating a new View (which makes the new one eligible for compaction)

Updated Branches: refs/heads/trunk 3bef1ccac - e37ca25cf back up new sstables before creating a new View (which makes the new one eligible for compaction) patch by jbellis, reviewed by marcuse for CASSANDRA-5410 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http

git commit: fix build and test error, should not use QueryPath

Updated Branches: refs/heads/trunk e37ca25cf - 6afbed371 fix build and test error, should not use QueryPath Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6afbed37 Tree:

git commit: Decide on a gcBefore before sending out TreeRequests

Updated Branches: refs/heads/trunk 3e0b21c45 - efbdee237 Decide on a gcBefore before sending out TreeRequests patch by marcuse, reviewed by yukim, for CASSANDRA-4932 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

git commit: Add an official way to disable autocompaction.

Updated Branches: refs/heads/trunk efbdee237 - ebefb77c6 Add an official way to disable autocompaction. patch by marcuse, reviewed by pcmanus for CASSANDRA-5074 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

[1/3] git commit: Avoid NPE when listing saved caches directory

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 40d7bdf80 - 63407db7e Avoid NPE when listing saved caches directory Patch by marcuse; reviewed by yukim for CASSANDRA-7632 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

[1/2] git commit: Avoid NPE when listing saved caches directory

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 cde566629 - ef099c317 Avoid NPE when listing saved caches directory Patch by marcuse; reviewed by yukim for CASSANDRA-7632 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef099c31 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef099c31 Diff:

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63407db7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63407db7 Diff:

[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef099c31 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef099c31 Diff:

[4/4] git commit: Merge branch 'cassandra-2.1' into trunk

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90ade6b4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90ade6b4 Diff:

[1/4] git commit: Avoid NPE when listing saved caches directory

Repository: cassandra Updated Branches: refs/heads/trunk a88c7e10f - 90ade6b45 Avoid NPE when listing saved caches directory Patch by marcuse; reviewed by yukim for CASSANDRA-7632 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63407db7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63407db7 Diff:

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef099c31 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef099c31 Diff:

[1/2] git commit: Throw EOFException if we run out of chunks in compressed file

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 af188ed36 - 39b81967f Throw EOFException if we run out of chunks in compressed file Patch by marcuse; reviewed by yukim for CASSANDRA-7664. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git

[1/4] git commit: Throw EOFException if we run out of chunks in compressed file

Repository: cassandra Updated Branches: refs/heads/trunk 504d3c515 - 060c7961d Throw EOFException if we run out of chunks in compressed file Patch by marcuse; reviewed by yukim for CASSANDRA-7664. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[4/4] git commit: Merge branch 'cassandra-2.1' into trunk

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/060c7961 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/060c7961 Diff:

[1/3] git commit: Throw EOFException if we run out of chunks in compressed file

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 558bb7246 - bd692ba74 Throw EOFException if we run out of chunks in compressed file Patch by marcuse; reviewed by yukim for CASSANDRA-7664. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39b81967 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39b81967 Diff:

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd692ba7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd692ba7 Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39b81967 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39b81967 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd692ba7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd692ba7 Diff:

git commit: Throw EOFException if we run out of chunks in compressed file

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 ecf1baebb - 76adf0e12 Throw EOFException if we run out of chunks in compressed file Patch by marcuse; reviewed by yukim for CASSANDRA-7664. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39b81967 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39b81967 Diff:

git commit: Anticompact sstables as groups

Repository: cassandra Updated Branches: refs/heads/trunk 060c7961d - 37f517593 Anticompact sstables as groups Patch by Russell Spitzer; reviewed by marcuse for CASSANDRA-6851 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[1/3] git commit: Correctly remove tmplink files

Repository: cassandra Updated Branches: refs/heads/trunk 8bd1bf664 - 5ec10197f Correctly remove tmplink files Patch by marcuse; reviewed by benedict for CASSANDRA-7803 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

git commit: Correctly remove tmplink files

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 af646fb75 - a41d5270f Correctly remove tmplink files Patch by marcuse; reviewed by benedict for CASSANDRA-7803 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f36d1b51 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f36d1b51 Diff:

[1/2] git commit: Correctly remove tmplink files

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 5aee12883 - f36d1b51b Correctly remove tmplink files Patch by marcuse; reviewed by benedict for CASSANDRA-7803 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f36d1b51 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f36d1b51 Diff:

[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ec10197 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ec10197 Diff:

git commit: Don't clear out range tombstones during compaction.

Repository: cassandra Updated Branches: refs/heads/cassandra-1.2 62642fa97 - 1cf986301 Don't clear out range tombstones during compaction. Patch by rlow; reviewed by marcuse for CASSANDRA-7808 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java test/unit/org/apache/cassandra/db/RangeTombstoneTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/2] git commit: Don't clear out range tombstones during compaction.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 20150727b - 61543b4c0 Don't clear out range tombstones during compaction. Patch by rlow; reviewed by marcuse for CASSANDRA-7808 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java test/unit/org/apache/cassandra/db/RangeTombstoneTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[3/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java test/unit/org/apache/cassandra/db/RangeTombstoneTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java test/unit/org/apache/cassandra/db/RangeTombstoneTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[6/8] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java test/unit/org/apache/cassandra/db/RangeTombstoneTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[2/8] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/statements/SelectStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/889f3ac5

[4/8] git commit: Don't clear out range tombstones during compaction.

Don't clear out range tombstones during compaction. Patch by rlow; reviewed by marcuse for CASSANDRA-7808 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1cf98630 Tree: http://git-wip-us.apache.org/repos/asf

[1/8] git commit: Always reject inequality on the partition key without token()

Repository: cassandra Updated Branches: refs/heads/trunk 125f19a88 - 846233526 Always reject inequality on the partition key without token() patch by blerer; reviewed by slebresne for CASSANDRA-7722 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java test/unit/org/apache/cassandra/db/RangeTombstoneTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[7/8] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fdf293dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdf293dc Diff:

[3/8] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/11d1edcc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11d1edcc Diff:

[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java test/unit/org/apache/cassandra/db/RangeTombstoneTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/4] git commit: Don't clear out range tombstones during compaction.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 11d1edcc1 - fdf293dc1 Don't clear out range tombstones during compaction. Patch by rlow; reviewed by marcuse for CASSANDRA-7808 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[8/8] git commit: Merge branch 'cassandra-2.1' into trunk

Merge branch 'cassandra-2.1' into trunk Conflicts: test/unit/org/apache/cassandra/db/RangeTombstoneTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84623352 Tree:

[4/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fdf293dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdf293dc Diff:

[1/3] git commit: Don't clear out range tombstones during compaction.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 889f3ac55 - d1f38cd27 Don't clear out range tombstones during compaction. Patch by rlow; reviewed by marcuse for CASSANDRA-7808 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[1/2] git commit: Track expired tombstones

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 9219361b6 - 29befa180 Track expired tombstones Patch by marcuse; reviewed by slebresne for CASSANDRA-7810 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

git commit: Track expired tombstones

Repository: cassandra Updated Branches: refs/heads/cassandra-1.2 1cf986301 - 7f9e9a871 Track expired tombstones Patch by marcuse; reviewed by slebresne for CASSANDRA-7810 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnIndex.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29befa18 Tree:

[1/3] git commit: Track expired tombstones

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 cb4bc2764 - 049762b3e Track expired tombstones Patch by marcuse; reviewed by slebresne for CASSANDRA-7810 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnIndex.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29befa18 Tree:

[3/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/049762b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/049762b3 Diff:

[1/4] git commit: Track expired tombstones

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 1be0bbf71 - 5abd129fd Track expired tombstones Patch by marcuse; reviewed by slebresne for CASSANDRA-7810 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

[4/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5abd129f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5abd129f Diff:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5abd129f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5abd129f Diff:

[2/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnIndex.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29befa18 Tree:

[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/049762b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/049762b3 Diff:

[3/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/049762b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/049762b3 Diff:

[5/5] git commit: Merge branch 'cassandra-2.1' into trunk

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f18108d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f18108d8 Diff:

[1/5] git commit: Track expired tombstones

Repository: cassandra Updated Branches: refs/heads/trunk 14dbba9d1 - f18108d81 Track expired tombstones Patch by marcuse; reviewed by slebresne for CASSANDRA-7810 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnIndex.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29befa18 Tree:

git commit: Track added sstable size correctly

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 b8be49b5e - de62175f2 Track added sstable size correctly Patch by marcuse; reviewed by jbellis for CASSANDRA-7239 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[1/2] git commit: Track added sstable size correctly

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 ed630e30e - bff7572ca Track added sstable size correctly Patch by marcuse; reviewed by jbellis for CASSANDRA-7239 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bff7572c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bff7572c Diff:

[1/3] git commit: Track added sstable size correctly

Repository: cassandra Updated Branches: refs/heads/trunk f92d00cc7 - 1bc8ffdae Track added sstable size correctly Patch by marcuse; reviewed by jbellis for CASSANDRA-7239 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1bc8ffda Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bc8ffda Diff:

[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bff7572c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bff7572c Diff:

[3/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/DataTracker.java src/java/org/apache/cassandra/db/compaction/LeveledManifest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/2] git commit: Don't allow marking already compacted sstables as compacting.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 e48e6f33a - 968ffd8dd Don't allow marking already compacted sstables as compacting. Patch by marcuse; reviewed by yukim for CASSANDRA-7145 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[1/3] git commit: Don't allow marking already compacted sstables as compacting.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 de62175f2 - ef8904550 Don't allow marking already compacted sstables as compacting. Patch by marcuse; reviewed by yukim for CASSANDRA-7145 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

git commit: Don't allow marking already compacted sstables as compacting.

Repository: cassandra Updated Branches: refs/heads/cassandra-1.2 7f9e9a871 - 8bef2609a Don't allow marking already compacted sstables as compacting. Patch by marcuse; reviewed by yukim for CASSANDRA-7145 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/968ffd8d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/968ffd8d Diff:

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/968ffd8d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/968ffd8d Diff:

[1/4] git commit: Don't allow marking already compacted sstables as compacting.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 bff7572ca - 40182323f Don't allow marking already compacted sstables as compacting. Patch by marcuse; reviewed by yukim for CASSANDRA-7145 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/968ffd8d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/968ffd8d Diff:

[5/5] git commit: Merge branch 'cassandra-2.1' into trunk

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eeb150e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eeb150e9 Diff:

[4/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40182323 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40182323 Diff:

[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/DataTracker.java src/java/org/apache/cassandra/db/compaction/LeveledManifest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/5] git commit: Don't allow marking already compacted sstables as compacting.

Repository: cassandra Updated Branches: refs/heads/trunk 1bc8ffdae - eeb150e9e Don't allow marking already compacted sstables as compacting. Patch by marcuse; reviewed by yukim for CASSANDRA-7145 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[2/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/968ffd8d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/968ffd8d Diff:

[3/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/DataTracker.java src/java/org/apache/cassandra/db/compaction/LeveledManifest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40182323 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40182323 Diff:

git commit: Don't expose internal classes over JMX

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 c81dc4bb2 - 45014886e Don't expose internal classes over JMX Patch by marcuse; reviewed by slebresne for CASSANDRA-7879 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/tools/NodeProbe.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37a9d405 Tree:

[1/3] git commit: Don't expose internal classes over JMX

Repository: cassandra Updated Branches: refs/heads/trunk 719bb3928 - 37a9d405c Don't expose internal classes over JMX Patch by marcuse; reviewed by slebresne for CASSANDRA-7879 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd972e6c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd972e6c Diff:

[1/2] git commit: Don't expose internal classes over JMX

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 d304b7cab - dd972e6c3 Don't expose internal classes over JMX Patch by marcuse; reviewed by slebresne for CASSANDRA-7879 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd972e6c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd972e6c Diff:

[5/5] git commit: Merge branch 'cassandra-2.1' into trunk

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionManager.java src/java/org/apache/cassandra/db/compaction/Upgrader.java src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java

[1/5] git commit: Make sure unfinished compaction files are removed.

Repository: cassandra Updated Branches: refs/heads/trunk e60a06cc8 - 0f59629ce Make sure unfinished compaction files are removed. Patch by marcuse; reviewed by yukim for CASSANDRA-8124 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

[4/5] Merge branch 'cassandra-2.1' into trunk

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f59629c/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index

[2/2] git commit: Refactor how we track live size

Refactor how we track live size Patch by marcuse; reviewed by yukim for CASSANDRA-7852 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5160c916 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5160c916

[3/5] Merge branch 'cassandra-2.1' into trunk

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f59629c/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java -- diff --cc test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java index

[1/2] git commit: Make sure unfinished compaction files are removed.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 d2309227c - 5160c916c Make sure unfinished compaction files are removed. Patch by marcuse; reviewed by yukim for CASSANDRA-8124 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[2/5] git commit: Refactor how we track live size

Refactor how we track live size Patch by marcuse; reviewed by yukim for CASSANDRA-7852 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5160c916 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5160c916

git commit: add the right set - followup to CASSANDRA-7586

Repository: cassandra Updated Branches: refs/heads/trunk 8d640fb14 - 071b8e391 add the right set - followup to CASSANDRA-7586 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/071b8e39 Tree:

  1   2   3   4   5   6   7   8   9   10   >