[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: NEWS.txt src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/4] cassandra git commit: Fixup missed nit from CASSANDRA-9965

Repository: cassandra Updated Branches: refs/heads/trunk a1f331f17 - f03783bef Fixup missed nit from CASSANDRA-9965 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76e8eb85 Tree:

cassandra git commit: Fixup missed nit from CASSANDRA-9965

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 5aca7d79a - 76e8eb853 Fixup missed nit from CASSANDRA-9965 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76e8eb85 Tree:

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

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

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

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

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

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

[1/2] cassandra git commit: Fixup missed nit from CASSANDRA-9965

Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 9c3b967e7 - 2dd8101ae Fixup missed nit from CASSANDRA-9965 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76e8eb85 Tree:

[1/3] cassandra git commit: Document removal of cold_reads_to_omit (CASSANDRA-9997)

Repository: cassandra Updated Branches: refs/heads/trunk f03783bef - 41c83e420 Document removal of cold_reads_to_omit (CASSANDRA-9997) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f14c854 Tree:

[2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e1e3369 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e1e3369 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e1e3369 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e1e3369 Diff:

cassandra git commit: Document removal of cold_reads_to_omit (CASSANDRA-9997)

Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 2dd8101ae - 4f14c8547 Document removal of cold_reads_to_omit (CASSANDRA-9997) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f14c854 Tree:

[1/2] cassandra git commit: Document removal of cold_reads_to_omit (CASSANDRA-9997)

Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 2dfcb221c - 6e1e33696 Document removal of cold_reads_to_omit (CASSANDRA-9997) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f14c854 Tree:

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

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

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

Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java src/java/org/apache/cassandra/service/CassandraDaemon.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a090cc5/src/java/org/apache/cassandra/io/util/FileUtils.java -- diff --cc src/java/org/apache/cassandra/io/util/FileUtils.java index 3552ca9,3be7c99..9f5193b ---

[1/5] cassandra git commit: Handle corrupt files on startup

Repository: cassandra Updated Branches: refs/heads/trunk 1f9d74c91 - 3b5ab3a47 Handle corrupt files on startup Patch by stefania; reviewed by marcuse for CASSANDRA-9686 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

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

Merge branch 'cassandra-2.2' into trunk Conflicts: src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b5ab3a4 Tree:

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

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

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

Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java src/java/org/apache/cassandra/service/CassandraDaemon.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

cassandra git commit: Handle corrupt files on startup

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 19c00f721 - 1ecccede7 Handle corrupt files on startup Patch by stefania; reviewed by marcuse for CASSANDRA-9686 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[1/4] cassandra git commit: Handle corrupt files on startup

Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 01f3d0a15 - 5a090cc5a Handle corrupt files on startup Patch by stefania; reviewed by marcuse for CASSANDRA-9686 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a090cc5/src/java/org/apache/cassandra/io/util/FileUtils.java -- diff --cc src/java/org/apache/cassandra/io/util/FileUtils.java index 3552ca9,3be7c99..9f5193b ---

cassandra git commit: Avoid anticompaction after non-global repairs

Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 134bcda0c - 842f1509d Avoid anticompaction after non-global repairs Patch by marcuse; reviewed by sankalp kohli for CASSANDRA-9142 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[1/3] cassandra git commit: Avoid anticompaction after non-global repairs

Repository: cassandra Updated Branches: refs/heads/trunk 34910c5a3 - aabad85fb Avoid anticompaction after non-global repairs Patch by marcuse; reviewed by sankalp kohli for CASSANDRA-9142 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

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

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

[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java src/java/org/apache/cassandra/repair/messages/PrepareMessage.java src/java/org/apache/cassandra/service/ActiveRepairService.java

[1/2] cassandra git commit: Avoid anticompaction after non-global repairs

Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 8afc76ae6 - f490ccec6 Avoid anticompaction after non-global repairs Patch by marcuse; reviewed by sankalp kohli for CASSANDRA-9142 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java src/java/org/apache/cassandra/repair/messages/PrepareMessage.java src/java/org/apache/cassandra/service/ActiveRepairService.java

[1/4] cassandra git commit: Don't try to get ancestors from half-renamed sstables

Repository: cassandra Updated Branches: refs/heads/trunk 928e4c28c -> 15f17adf8 Don't try to get ancestors from half-renamed sstables Patch by marcuse; reviewed by yukim for CASSANDRA-10501 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

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

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

[1/3] cassandra git commit: Don't try to get ancestors from half-renamed sstables

Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 609497471 -> 95e16005e Don't try to get ancestors from half-renamed sstables Patch by marcuse; reviewed by yukim for CASSANDRA-10501 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

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

[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95e16005 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95e16005 Diff:

[3/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95e16005 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95e16005 Diff:

[1/2] cassandra git commit: Don't try to get ancestors from half-renamed sstables

Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 32f22a4e3 -> b06c637f1 Don't try to get ancestors from half-renamed sstables Patch by marcuse; reviewed by yukim for CASSANDRA-10501 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

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

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

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

cassandra git commit: Don't try to get ancestors from half-renamed sstables

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 17082d4b5 -> 87f43ac51 Don't try to get ancestors from half-renamed sstables Patch by marcuse; reviewed by yukim for CASSANDRA-10501 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

cassandra git commit: Do size tiered compaction in date tiered compaction windows

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 78810f255 -> cedcf07c5 Do size tiered compaction in date tiered compaction windows Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-10276 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

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

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

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

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

[1/2] cassandra git commit: Do size tiered compaction in date tiered compaction windows

Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 40cef770d -> 5a356a706 Do size tiered compaction in date tiered compaction windows Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-10276 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

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

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

[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27ca4915 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27ca4915 Diff:

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

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

[1/3] cassandra git commit: Do size tiered compaction in date tiered compaction windows

Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 d856d3d7b -> 27ca4915e Do size tiered compaction in date tiered compaction windows Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-10276 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

[3/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27ca4915 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27ca4915 Diff:

[1/4] cassandra git commit: Do size tiered compaction in date tiered compaction windows

Repository: cassandra Updated Branches: refs/heads/trunk 7cedeca9a -> 5995de3b6 Do size tiered compaction in date tiered compaction windows Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-10276 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[1/3] cassandra git commit: Keep the file open in trySkipCache

Repository: cassandra Updated Branches: refs/heads/trunk 3820e89d9 -> 55811e561 Keep the file open in trySkipCache Patch by marcuse; reviewed by Stefania Alborghetti for CASSANDRA-10669 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/re

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f7b3898 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f7b3898 Diff:

cassandra git commit: Keep the file open in trySkipCache

Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 d00fcbc43 -> 49c9c01f5 Keep the file open in trySkipCache Patch by marcuse; reviewed by Stefania Alborghetti for CASSANDRA-10669 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

Merge branch 'cassandra-3.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/55811e56 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55811e56 Diff:

[1/2] cassandra git commit: Keep the file open in trySkipCache

Repository: cassandra Updated Branches: refs/heads/cassandra-3.1 11b073e63 -> 6f7b38987 Keep the file open in trySkipCache Patch by marcuse; reviewed by Stefania Alborghetti for CASSANDRA-10669 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[2/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f7b3898 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f7b3898 Diff:

cassandra git commit: Skip redundant tombstones on compaction.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 02f88e38e -> a61fc01f4 Skip redundant tombstones on compaction. Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-7953 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[1/2] cassandra git commit: Skip redundant tombstones on compaction.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 bee48ebe2 -> 3b7ccdfb1 Skip redundant tombstones on compaction. Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-7953 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[3/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a1c1d90 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a1c1d90 Diff:

[1/4] cassandra git commit: Skip redundant tombstones on compaction.

Repository: cassandra Updated Branches: refs/heads/trunk 29576a44d -> 0e3da95d6 Skip redundant tombstones on compaction. Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-7953 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/re

[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a1c1d90 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a1c1d90 Diff:

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

Merge branch 'cassandra-2.1' into cassandra-2.2 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/3b7ccdfb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b7ccdfb Diff:

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

Merge branch 'cassandra-2.1' into cassandra-2.2 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/3b7ccdfb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b7ccdfb Diff:

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

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

[1/3] cassandra git commit: Skip redundant tombstones on compaction.

Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 b42a0cfe8 -> 6a1c1d900 Skip redundant tombstones on compaction. Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-7953 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

Merge branch 'cassandra-2.1' into cassandra-2.2 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/3b7ccdfb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b7ccdfb Diff:

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

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

[1/2] cassandra git commit: Followup to CASSANDRA-8671 - additional data directories

Repository: cassandra Updated Branches: refs/heads/trunk 6ef817a51 -> c20f6b374 Followup to CASSANDRA-8671 - additional data directories Patch by Blake Eggleston; reviewed by marcuse for CASSANDRA-10518 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

cassandra git commit: Followup to CASSANDRA-8671 - additional data directories

Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 f3143e624 -> e1fb18a00 Followup to CASSANDRA-8671 - additional data directories Patch by Blake Eggleston; reviewed by marcuse for CASSANDRA-10518 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: h

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

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

cassandra git commit: Force blocking flush of peers when removing endpoint.

Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 fc92c9621 -> 50fae5df1 Force blocking flush of peers when removing endpoint. Patch by Joel Knighton; reviewed by Stefania for CASSANDRA-10231 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/2] cassandra git commit: Force blocking flush of peers when removing endpoint.

Repository: cassandra Updated Branches: refs/heads/trunk 739de136d -> 16f29aac9 Force blocking flush of peers when removing endpoint. Patch by Joel Knighton; reviewed by Stefania for CASSANDRA-10231 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

cassandra git commit: Update cassandra.yaml allocate_tokens_for_keyspace to match the actual config variable

Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 566799f56 -> 36d0f55d4 Update cassandra.yaml allocate_tokens_for_keyspace to match the actual config variable Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/2] cassandra git commit: Update cassandra.yaml allocate_tokens_for_keyspace to match the actual config variable

Repository: cassandra Updated Branches: refs/heads/trunk 07782aa4a -> c2bc39f28 Update cassandra.yaml allocate_tokens_for_keyspace to match the actual config variable Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

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

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

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

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

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

[1/5] cassandra git commit: Reject incremental repair requests combined with subrange repair

Repository: cassandra Updated Branches: refs/heads/cassandra-3.1 36e767714 -> 798a7a8fe Reject incremental repair requests combined with subrange repair Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-10422 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Com

[4/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

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

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

[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[3/6] cassandra git commit: Don't do anticompaction after subrange repair

Don't do anticompaction after subrange repair Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-10422 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99b82dbb Tree: http://git-wip-us.apache.org/repos/asf

[1/4] cassandra git commit: Reject incremental repair requests combined with subrange repair

Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 c0480d8bb -> eb8afb71f Reject incremental repair requests combined with subrange repair Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-10422 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Com

[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/798a7a8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/798a7a8f Diff:

[3/4] cassandra git commit: Don't do anticompaction after subrange repair

Don't do anticompaction after subrange repair Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-10422 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99b82dbb Tree: http://git-wip-us.apache.org/repos/asf

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

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

[4/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[3/3] cassandra git commit: Don't do anticompaction after subrange repair

Don't do anticompaction after subrange repair Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-10422 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99b82dbb Tree: http://git-wip-us.apache.org/repos/asf

[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/798a7a8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/798a7a8f Diff:

[1/6] cassandra git commit: Reject incremental repair requests combined with subrange repair

Repository: cassandra Updated Branches: refs/heads/trunk 0010fce6d -> 6645062ca Reject incremental repair requests combined with subrange repair Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-10422 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

[3/5] cassandra git commit: Don't do anticompaction after subrange repair

Don't do anticompaction after subrange repair Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-10422 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99b82dbb Tree: http://git-wip-us.apache.org/repos/asf

[1/3] cassandra git commit: Reject incremental repair requests combined with subrange repair

Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 73a730f92 -> 99b82dbb4 Reject incremental repair requests combined with subrange repair Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-10422 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Com

[6/6] cassandra git commit: Merge branch 'cassandra-3.1' into trunk

Merge branch 'cassandra-3.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/6645062c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6645062c Diff:

cassandra git commit: Reject incremental repair requests combined with subrange repair

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 7e056fa27 -> a8e8a6730 Reject incremental repair requests combined with subrange repair Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-10422 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Com

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

Merge branch 'cassandra-2.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/c2eb7bd7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2eb7bd7 Diff:

[4/4] cassandra git commit: Properly deserialize PrepareMessage for global repairs

Properly deserialize PrepareMessage for global repairs Patch by marcuse; reviewed by yukim for CASSANDRA-10265 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dae2045f Tree: http://git-wip-us.apache.org/repos/asf

[1/4] cassandra git commit: Dont propagate exception in sstableexpiredblockers

Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 464ca14aa -> dae2045f0 Dont propagate exception in sstableexpiredblockers Patch by marcuse; reviewed by brandonwilliams for CASSANDRA-10240 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

Merge branch 'cassandra-2.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/c2eb7bd7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2eb7bd7 Diff:

[6/8] cassandra git commit: Properly deserialize PrepareMessage for global repairs

Properly deserialize PrepareMessage for global repairs Patch by marcuse; reviewed by yukim for CASSANDRA-10265 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dae2045f Tree: http://git-wip-us.apache.org/repos/asf

[4/8] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

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

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

<    5   6   7   8   9   10   11   12   13   14   >