cassandra git commit: Fix handling of enable/disable autocompaction.

2015-07-29 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 739520752 -> dce303bcb Fix handling of enable/disable autocompaction. Patch by marcuse; reviewed by Jeremiah Jordan for CASSANDRA-9899 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2015-07-29 Thread marcuse
Merge branch 'cassandra-2.2' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: htt

[1/3] cassandra git commit: Fix handling of enable/disable autocompaction.

2015-07-29 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 3e75d5a62 -> d26187e5c Fix handling of enable/disable autocompaction. Patch by marcuse; reviewed by Jeremiah Jordan for CASSANDRA-9899 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

[1/2] cassandra git commit: Fix handling of enable/disable autocompaction.

2015-07-29 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 a96b207c3 -> 325aeb76b Fix handling of enable/disable autocompaction. Patch by marcuse; reviewed by Jeremiah Jordan for CASSANDRA-9899 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

2015-07-29 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java Project: http://git-wip-us.apache.org/repos/asf/

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

2015-07-29 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java Project: http://git-wip-us.apache.org/repos/asf/

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

2015-07-30 Thread marcuse
Merge branch 'cassandra-2.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/51b92f82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51b92f82 Diff: http://git-wip-us.apache.org/repos/asf/cassand

cassandra git commit: DTCS should not group sstables for anticompaction

2015-07-30 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 b334f519f -> 16bc74a67 DTCS should not group sstables for anticompaction Patch by marcuse; reviewed by yukim for CASSANDRA-9900 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[1/2] cassandra git commit: DTCS should not group sstables for anticompaction

2015-07-30 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk b44a773b9 -> 51b92f82d DTCS should not group sstables for anticompaction Patch by marcuse; reviewed by yukim for CASSANDRA-9900 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/re

[1/2] cassandra git commit: Dont cast expected bloom filter size to int

2015-08-03 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 8f9ca07e9 -> 5c58af97a Dont cast expected bloom filter size to int Patch by marcuse; reviewed by Jason Brown for CASSANDRA-9959 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

cassandra git commit: Dont cast expected bloom filter size to int

2015-08-03 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 878d61642 -> 45bd07f6f Dont cast expected bloom filter size to int Patch by marcuse; reviewed by Jason Brown for CASSANDRA-9959 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2015-08-03 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/CompactionManager.java src/java/org/apache/cassandra/db/compaction/Scrubber.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http:

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

2015-08-03 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/CompactionManager.java src/java/org/apache/cassandra/db/compaction/Scrubber.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http:

[1/4] cassandra git commit: Dont cast expected bloom filter size to int

2015-08-03 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 4d39d4d54 -> a7cc419bb Dont cast expected bloom filter size to int Patch by marcuse; reviewed by Jason Brown for CASSANDRA-9959 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/re

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

2015-08-03 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/CompactionManager.java src/java/org/apache/cassandra/db/compaction/Scrubber.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http:

[1/3] cassandra git commit: Dont cast expected bloom filter size to int

2015-08-03 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 830137f1a -> 925e620b4 Dont cast expected bloom filter size to int Patch by marcuse; reviewed by Jason Brown for CASSANDRA-9959 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2015-08-03 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/CompactionManager.java src/java/org/apache/cassandra/db/compaction/Scrubber.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http:

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

2015-08-03 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/CompactionManager.java src/java/org/apache/cassandra/db/compaction/Scrubber.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http:

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

2015-08-03 Thread marcuse
Merge branch 'cassandra-2.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/a7cc419b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7cc419b Diff: http://git-wip-us.apache.org/repos/asf/cassand

cassandra git commit: Avoid having compactions disabled on new tables

2015-08-03 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 5c58af97a -> b724d1ea5 Avoid having compactions disabled on new tables Patch by marcuse; reviewed by Jeremiah Jordan for CASSANDRA-9963 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

2015-08-03 Thread marcuse
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/f60abbdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f60abbdd Diff: http://git-wip-us.apache.org/repos/asf

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

2015-08-03 Thread marcuse
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/f60abbdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f60abbdd Diff: http://git-wip-us.apache.org/repos/asf

[1/2] cassandra git commit: Avoid having compactions disabled on new tables

2015-08-03 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 4765cd6f1 -> f60abbdd5 Avoid having compactions disabled on new tables Patch by marcuse; reviewed by Jeremiah Jordan for CASSANDRA-9963 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[1/3] cassandra git commit: Avoid having compactions disabled on new tables

2015-08-03 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 4d1b3d268 -> 1415d7e9e Avoid having compactions disabled on new tables Patch by marcuse; reviewed by Jeremiah Jordan for CASSANDRA-9963 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2015-08-03 Thread marcuse
Merge branch 'cassandra-2.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/1415d7e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1415d7e9 Diff: http://git-wip-us.apache.org/repos/asf/cassand

cassandra git commit: fix build

2015-08-03 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 1415d7e9e -> cc95bae85 fix build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc95bae8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc95bae

cassandra git commit: Add unit tests for enable/disable autocompaction

2015-08-04 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 b724d1ea5 -> 1a2c1bcdc Add unit tests for enable/disable autocompaction Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a2c1bcd Tree: http://git-wip

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

2015-08-04 Thread marcuse
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6932bd87 Tree: http://git-wip-us.

[1/3] cassandra git commit: Add unit tests for enable/disable autocompaction

2015-08-04 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 72f5fbd23 -> 6932bd879 Add unit tests for enable/disable autocompaction Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a2c1bcd Tree: http://git-wip

[1/2] cassandra git commit: Add unit tests for enable/disable autocompaction

2015-08-04 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 5a54d9a62 -> 5c59d5af7 Add unit tests for enable/disable autocompaction Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a2c1bcd Tree: http://git-wip

[1/4] cassandra git commit: Add unit tests for enable/disable autocompaction

2015-08-04 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 9acf58801 -> 7d2a96ef6 Add unit tests for enable/disable autocompaction Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a2c1bcd Tree: http://git-wip-us.apac

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

2015-08-04 Thread marcuse
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/5c59d5af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c59d5af Diff: http://git-wip-us.apache.org/repos/asf

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

2015-08-04 Thread marcuse
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/5c59d5af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c59d5af Diff: http://git-wip-us.apache.org/repos/asf

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

2015-08-04 Thread marcuse
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6932bd87 Tree: http://git-wip-us.

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

2015-08-04 Thread marcuse
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/5c59d5af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c59d5af Diff: http://git-wip-us.apache.org/repos/asf

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

2015-08-04 Thread marcuse
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/7d2a96ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d2a96ef Diff: http://git-wip-us.apache.org/repos/asf/cassand

cassandra git commit: Release the self ref when opening snapshot sstable readers

2015-08-06 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e1bb79260 -> e9b975c27 Release the self ref when opening snapshot sstable readers Patch by marcuse; reviewed by benedict for CASSANDRA-9998 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

2015-08-06 Thread marcuse
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/bf08e663 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf08e663 Diff: http:/

[1/3] cassandra git commit: Release the self ref when opening snapshot sstable readers

2015-08-06 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 0a94c7a36 -> 528500090 Release the self ref when opening snapshot sstable readers Patch by marcuse; reviewed by benedict for CASSANDRA-9998 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[1/2] cassandra git commit: Release the self ref when opening snapshot sstable readers

2015-08-06 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 ed4fad19e -> bf08e663b Release the self ref when opening snapshot sstable readers Patch by marcuse; reviewed by benedict for CASSANDRA-9998 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2015-08-06 Thread marcuse
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/bf08e663 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf08e663 Diff: http:/

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

2015-08-06 Thread marcuse
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52850009 Tree: http://git-

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

2015-08-06 Thread marcuse
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/4f51341b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f51341b Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2015-08-06 Thread marcuse
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52850009 Tree: http://git-

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

2015-08-06 Thread marcuse
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/bf08e663 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf08e663 Diff: http:/

[1/4] cassandra git commit: Release the self ref when opening snapshot sstable readers

2015-08-06 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 448e276b7 -> 4f51341b5 Release the self ref when opening snapshot sstable readers Patch by marcuse; reviewed by benedict for CASSANDRA-9998 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[1/2] cassandra git commit: Add new JMX methods to change local compaction strategy

2015-08-10 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 6d0cf7dbd -> 9c3b967e7 Add new JMX methods to change local compaction strategy Patch by marcuse; reviewed by iamaleksey for CASSANDRA-9965 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

2015-08-10 Thread marcuse
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: src/java/org/apache/cassandra/config/CFMetaData.java src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java Project: http:/

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

2015-08-10 Thread marcuse
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/a1f331f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1f331f1 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[1/4] cassandra git commit: Add new JMX methods to change local compaction strategy

2015-08-10 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk ba56b8221 -> a1f331f17 Add new JMX methods to change local compaction strategy Patch by marcuse; reviewed by iamaleksey for CASSANDRA-9965 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2015-08-10 Thread marcuse
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: src/java/org/apache/cassandra/config/CFMetaData.java src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java Project: http:/

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

2015-08-10 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/config/CFMetaData.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c3b967e Tree: http://git-wip

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

2015-08-10 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/config/CFMetaData.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c3b967e Tree: http://git-wip

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

2015-08-10 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/config/CFMetaData.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c3b967e Tree: http://git-wip

[1/3] cassandra git commit: Add new JMX methods to change local compaction strategy

2015-08-10 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 e389dc421 -> 929438b8b Add new JMX methods to change local compaction strategy Patch by marcuse; reviewed by iamaleksey for CASSANDRA-9965 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

cassandra git commit: Add new JMX methods to change local compaction strategy

2015-08-10 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c8d163f73 -> 5aca7d79a Add new JMX methods to change local compaction strategy Patch by marcuse; reviewed by iamaleksey for CASSANDRA-9965 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2015-08-10 Thread marcuse
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: http://git-wip-us.apache.o

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

2015-08-10 Thread marcuse
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: http://git-wip-us.apache.org/repos/asf

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

2015-08-10 Thread marcuse
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: htt

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

2015-08-10 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 929438b8b -> 2dfcb221c 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: http://git-wip-us.apache.o

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

2015-08-10 Thread marcuse
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: htt

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

2015-08-10 Thread marcuse
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: http://git-wip-us.apache.org/repos

cassandra git commit: Fixup missed nit from CASSANDRA-9965

2015-08-10 Thread marcuse
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: http://git-wip-us.apache.o

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

2015-08-10 Thread marcuse
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: http://git-wip-us.apache.org/repos/asf

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

2015-08-10 Thread marcuse
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: http://git-wip-us.apache.org/repos/asf/cassand

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

2015-08-10 Thread marcuse
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: http://git-wip-us.apache.org/repos/asf

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

2015-08-10 Thread marcuse
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: http://git-wip-us.apache.org/repos/asf

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

2015-08-10 Thread marcuse
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: http://

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

2015-08-10 Thread marcuse
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: http://

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

2015-08-10 Thread marcuse
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: http://git-wip-

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

2015-08-10 Thread marcuse
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: http://git-wip-us.apache.org/repos/asf

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

2015-08-10 Thread marcuse
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: http://git-wip-us.apache.org/repos/asf/cassand

[1/2] cassandra git commit: Add option to only purge tombstones from repaired sstables

2015-08-10 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk e8ac7edb7 -> b1c739874 Add option to only purge tombstones from repaired sstables Patch by marcuse; reviewed by yukim for CASSANDRA-6434 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2015-08-10 Thread marcuse
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/b1c73987 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1c73987 Diff: http://git-wip-us.apache.org/repos/asf/cassand

cassandra git commit: Add option to only purge tombstones from repaired sstables

2015-08-10 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 76ca69717 -> 6f0c12f3a Add option to only purge tombstones from repaired sstables Patch by marcuse; reviewed by yukim for CASSANDRA-6434 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2015-08-11 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/012b987e Tree: htt

[1/3] cassandra git commit: Add tool to find why expired sstables are not getting dropped

2015-08-11 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 4f14c8547 -> 5431a88d7 Add tool to find why expired sstables are not getting dropped Patch by marcuse; reviewed by stefania for CASSANDRA-10015 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

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

2015-08-11 Thread marcuse
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/213aab8c Tree: http://git-wip-us.apach

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

2015-08-11 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/012b987e Tree: htt

cassandra git commit: Add tool to find why expired sstables are not getting dropped

2015-08-11 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 de84a5c77 -> 028e7cb5a Add tool to find why expired sstables are not getting dropped Patch by marcuse; reviewed by stefania for CASSANDRA-10015 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

[1/4] cassandra git commit: Add tool to find why expired sstables are not getting dropped

2015-08-11 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 6f0c12f3a -> 213aab8c1 Add tool to find why expired sstables are not getting dropped Patch by marcuse; reviewed by stefania for CASSANDRA-10015 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

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

2015-08-11 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5431a88d Tree: http://git-wip-us.apach

[1/2] cassandra git commit: Add tool to find why expired sstables are not getting dropped

2015-08-11 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 76e8eb853 -> 012b987e2 Add tool to find why expired sstables are not getting dropped Patch by marcuse; reviewed by stefania for CASSANDRA-10015 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

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

2015-08-11 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/012b987e Tree: htt

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

2015-08-11 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5431a88d Tree: http://git-wip-us.apach

[1/5] cassandra git commit: Add tool to find why expired sstables are not getting dropped

2015-08-11 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk b1c739874 -> 9e8741f28 Add tool to find why expired sstables are not getting dropped Patch by marcuse; reviewed by stefania for CASSANDRA-10015 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2015-08-11 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/012b987e Tree: htt

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

2015-08-11 Thread marcuse
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/213aab8c Tree: http://git-wip-us.apach

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

2015-08-11 Thread marcuse
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/9e8741f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e8741f2 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2015-08-11 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5431a88d Tree: http://git-wip-us.apach

cassandra git commit: Make getFullyExpiredSSTables less expensive.

2015-08-16 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 50e5802a7 -> f53aacba8 Make getFullyExpiredSSTables less expensive. Patch by marcuse; reviewed by yukim for CASSANDRA-9882 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

[1/2] cassandra git commit: Make getFullyExpiredSSTables less expensive.

2015-08-16 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 7a6a5097a -> 26ff15070 Make getFullyExpiredSSTables less expensive. Patch by marcuse; reviewed by yukim for CASSANDRA-9882 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

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

2015-08-16 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26f

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

2015-08-16 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26f

[1/3] cassandra git commit: Make getFullyExpiredSSTables less expensive.

2015-08-16 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 0f287c46f -> 31db093c4 Make getFullyExpiredSSTables less expensive. Patch by marcuse; reviewed by yukim for CASSANDRA-9882 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

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

2015-08-16 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: src/java/org/apache/cassandra/db/ColumnFamilyStore.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31db093c Tree: http://git-wip-us.apache.org/re

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

2015-08-16 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: src/java/org/apache/cassandra/db/ColumnFamilyStore.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31db093c Tree: http://git-wip-us.apache.org/re

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

2015-08-16 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: src/java/org/apache/cassandra/db/ColumnFamilyStore.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31db093c Tree: http://git-wip-us.apache.org/re

[1/5] cassandra git commit: Make getFullyExpiredSSTables less expensive.

2015-08-16 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk c41412a7f -> 6ae27a320 Make getFullyExpiredSSTables less expensive. Patch by marcuse; reviewed by yukim for CASSANDRA-9882 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

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

2015-08-16 Thread marcuse
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/6ae27a32 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ae27a32 Diff: http://git-wip-us.apache.org/repos/asf/cassand

  1   2   3   4   5   6   7   8   9   10   >