cassandra git commit: Check if the filtered sstables are empty in STCS

2015-02-24 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 407b5de67 -> 0a7f50876 Check if the filtered sstables are empty in STCS Patch by jjordan; reviewed by marcuse for CASSANDRA-8843 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[1/2] cassandra git commit: Check if the filtered sstables are empty in STCS

2015-02-24 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk ee5e48795 -> b944f0d66 Check if the filtered sstables are empty in STCS Patch by jjordan; reviewed by marcuse for CASSANDRA-8843 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-2.1' into trunk

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

cassandra git commit: Tool to create a leveling based on an existing set of sstables.

2015-03-02 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 5654e7368 -> 33a3a09cb Tool to create a leveling based on an existing set of sstables. Patch by marcuse; reviewed by carlyeks for CASSANDRA-8301 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-03-02 Thread marcuse
Merge branch 'cassandra-2.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/1e74dd0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e74dd0d Diff: http:/

[1/2] cassandra git commit: Tool to create a leveling based on an existing set of sstables.

2015-03-02 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e76ebcec1 -> 1e74dd0d1 Tool to create a leveling based on an existing set of sstables. Patch by marcuse; reviewed by carlyeks for CASSANDRA-8301 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

[1/3] cassandra git commit: Tool to create a leveling based on an existing set of sstables.

2015-03-02 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 369ed3e1d -> f257b669d Tool to create a leveling based on an existing set of sstables. Patch by marcuse; reviewed by carlyeks for CASSANDRA-8301 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 trunk

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

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

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

cassandra git commit: Pick sstables to validate as late as possible with inc repairs

2015-03-03 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 33279dd8c -> 2f7077c06 Pick sstables to validate as late as possible with inc repairs Patch by marcuse; reviewed by yukim for CASSANDRA-8366 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 trunk

2015-03-03 Thread marcuse
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionManager.java src/java/org/apache/cassandra/service/ActiveRepairService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

[1/2] cassandra git commit: Pick sstables to validate as late as possible with inc repairs

2015-03-03 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 7cc51f7ae -> 2818ca4cf Pick sstables to validate as late as possible with inc repairs Patch by marcuse; reviewed by yukim for CASSANDRA-8366 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

cassandra git commit: Remove cold_reads_to_omit from STCS

2015-03-04 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 d4e37869b -> 33a9adac8 Remove cold_reads_to_omit from STCS Patch by marcuse; reviewed by thobbs for CASSANDRA-8860 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

[1/2] cassandra git commit: Remove cold_reads_to_omit from STCS

2015-03-04 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 89d31f3da -> b5b1af703 Remove cold_reads_to_omit from STCS Patch by marcuse; reviewed by thobbs for CASSANDRA-8860 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassan

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

2015-03-04 Thread marcuse
Merge branch 'cassandra-2.1' into trunk Conflicts: NEWS.txt test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5b1af70

cassandra git commit: Use long for key count in cfstats

2015-03-06 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e8fbfc082 -> 2e3a28777 Use long for key count in cfstats patch by marcuse; reviewed by yukim for CASSANDRA-8913 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

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

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

[1/2] cassandra git commit: Use long for key count in cfstats

2015-03-06 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk a1b574e52 -> 3a44b4c6b Use long for key count in cfstats patch by marcuse; reviewed by yukim for CASSANDRA-8913 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassan

[1/2] git commit: Track expired tombstones

2014-08-27 Thread marcuse
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/cassan

git commit: Track expired tombstones

2014-08-27 Thread marcuse
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/cassan

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

2014-08-27 Thread marcuse
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: http://git-wip-us

[1/3] git commit: Track expired tombstones

2014-08-27 Thread marcuse
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/

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

2014-08-27 Thread marcuse
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: http://git-wip-us

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

2014-08-27 Thread marcuse
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: http

[1/4] git commit: Track expired tombstones

2014-08-27 Thread marcuse
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/cassan

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

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

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

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

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

2014-08-27 Thread marcuse
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: http://git-wip-us

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

2014-08-27 Thread marcuse
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: http

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

2014-08-27 Thread marcuse
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: http

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

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

[1/5] git commit: Track expired tombstones

2014-08-27 Thread marcuse
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/com

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

2014-08-27 Thread marcuse
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: http://git-wip-us

git commit: Track added sstable size correctly

2014-09-01 Thread marcuse
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/

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

2014-09-01 Thread marcuse
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/

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

2014-09-01 Thread marcuse
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: http

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

2014-09-01 Thread marcuse
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/cassan

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

2014-09-01 Thread marcuse
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: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-09-01 Thread marcuse
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: http

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

2014-09-01 Thread marcuse
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: http://git-wi

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

2014-09-01 Thread marcuse
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:/

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

2014-09-01 Thread marcuse
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: ht

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

2014-09-01 Thread marcuse
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:/

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

2014-09-01 Thread marcuse
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: http:/

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

2014-09-01 Thread marcuse
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: http:/

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

2014-09-01 Thread marcuse
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:/

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

2014-09-01 Thread marcuse
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: http:/

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

2014-09-01 Thread marcuse
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: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-09-01 Thread marcuse
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: http://git-wip-us.apache.org/repos/a

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

2014-09-01 Thread marcuse
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: http://git-wi

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

2014-09-01 Thread marcuse
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:/

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

2014-09-01 Thread marcuse
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: http:/

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

2014-09-01 Thread marcuse
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: http://git-wi

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

2014-09-01 Thread marcuse
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: http://git-wip-us.apache.org/repos/a

git commit: Don't expose internal classes over JMX

2014-09-05 Thread marcuse
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.ap

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

2014-09-05 Thread marcuse
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: http://git-wip-us.apache.org/repos/asf/cassa

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

2014-09-05 Thread marcuse
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/r

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

2014-09-05 Thread marcuse
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: http

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

2014-09-05 Thread marcuse
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.o

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

2014-09-05 Thread marcuse
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: http

[1/2] git commit: Dont try to set repairedAt on old sstables

2014-09-13 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk e5d1528e5 -> 5fc486a1c Dont try to set repairedAt on old sstables Patch by marcuse; reviewed by jbellis for CASSANDRA-7913 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

git commit: Dont try to set repairedAt on old sstables

2014-09-13 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 f168fdad6 -> 25eb83091 Dont try to set repairedAt on old sstables Patch by marcuse; reviewed by jbellis for CASSANDRA-7913 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

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

2014-09-13 Thread marcuse
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/5fc486a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fc486a1 Diff: http://git-wip-us.apache.org/repos/asf/cassand

git commit: Improve compaction logging

2014-09-15 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 7fc0e9efe -> 5f37e9fa5 Improve compaction logging Patch by Mihai Suteu; reviewed by marcuse for CASSANDRA-7818 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassan

git commit: Clean up compaction logging more - followup to CASSANDRA-7818

2014-09-16 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk feb30e21c -> 38d5178a3 Clean up compaction logging more - followup to CASSANDRA-7818 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38d5178a Tree: http://gi

git commit: Support many sstables to be passed into sstablerepairedset

2014-09-26 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c65ef9af6 -> 2a12e0574 Support many sstables to be passed into sstablerepairedset Patch by carlyeks; reviewed by marcuse for CASSANDRA-7995 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[1/2] git commit: Support many sstables to be passed into sstablerepairedset

2014-09-26 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 380273826 -> 0485a31c0 Support many sstables to be passed into sstablerepairedset Patch by carlyeks; reviewed by marcuse for CASSANDRA-7995 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2014-09-26 Thread marcuse
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0485a31c Tree: http://git-wip-us.apache.org/r

git commit: Track min/max timestamps and maxLocalDeletionTime correctly

2014-10-02 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 1a096efeb -> 7110d980c Track min/max timestamps and maxLocalDeletionTime correctly Patch by marcuse; reviewed by tjake for CASSANDRA-7969 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2014-10-02 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/ColumnFamily.java src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Project: http://git-wip-us.apache.

[1/2] git commit: Track min/max timestamps and maxLocalDeletionTime correctly

2014-10-02 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 b701dd52f -> 97b1d9f63 Track min/max timestamps and maxLocalDeletionTime correctly Patch by marcuse; reviewed by tjake for CASSANDRA-7969 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2014-10-02 Thread marcuse
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/906fd4d8 Tree: http://git-wip-us.apache.org/repos/as

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

2014-10-02 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/ColumnFamily.java src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Project: http://git-wip-us.apache.

[1/3] git commit: Track min/max timestamps and maxLocalDeletionTime correctly

2014-10-02 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk be199a07c -> 906fd4d81 Track min/max timestamps and maxLocalDeletionTime correctly Patch by marcuse; reviewed by tjake for CASSANDRA-7969 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

git commit: Notify whenever we replace an SSTableReader

2014-10-02 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 97b1d9f63 -> 31235bc39 Notify whenever we replace an SSTableReader Patch by marcuse; reviewed by yukim for CASSANDRA-8034 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

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

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

[1/2] git commit: Notify whenever we replace an SSTableReader

2014-10-02 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 906fd4d81 -> d92932ac4 Notify whenever we replace an SSTableReader Patch by marcuse; reviewed by yukim for CASSANDRA-8034 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

git commit: Release references to compacted overlapping sstables during compaction

2014-10-02 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 474381193 -> 0793e569b Release references to compacted overlapping sstables during compaction Patch by benedict; reviewed by marcuse for CASSANDRA-7819 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Com

[1/2] git commit: Release references to compacted overlapping sstables during compaction

2014-10-02 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk b91250556 -> 0db507454 Release references to compacted overlapping sstables during compaction Patch by benedict; reviewed by marcuse for CASSANDRA-7819 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

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

2014-10-02 Thread marcuse
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/0db50745 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0db50745 Diff: http://git-wip-us.apache.org/repos/asf/cassand

git commit: fix build

2014-10-02 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 0793e569b -> 1c3932086 fix build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c393208 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[1/2] git commit: fix build

2014-10-02 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 0db507454 -> 4bb8f14a5 fix build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c393208 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c39320

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

2014-10-02 Thread marcuse
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/4bb8f14a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bb8f14a Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-10-06 Thread marcuse
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/68371c65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68371c65 Diff: http://git-wip-us.apache.org/repos/asf/cassand

git commit: Track added size correctly

2014-10-06 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 aca80da38 -> 6c3a3e130 Track added 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/cassan

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

2014-10-06 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 50c5da991 -> 68371c655 Track added 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/com

git commit: Keep sstable level when bootstrapping

2014-10-13 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk e473769fb -> 0de0b8c03 Keep sstable level when bootstrapping Patch by marcuse; reviewed by iamaleksey for CASSANDRA-7460 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.0' into cassandra-2.1

2014-10-16 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: NEWS.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dea9839 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dea9839 Diff: http://gi

git commit: Add DateTieredCompactionStrategy

2014-10-16 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 98bcf4022 -> 77dae508c Add DateTieredCompactionStrategy Patch by Bjorn Hegerfors; reviewed by marcuse for CASSANDRA-6602 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/re

[1/2] git commit: Add DateTieredCompactionStrategy

2014-10-16 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 1ef7d056d -> 1dea98396 Add DateTieredCompactionStrategy Patch by Bjorn Hegerfors; reviewed by marcuse for CASSANDRA-6602 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/re

[1/3] git commit: Add DateTieredCompactionStrategy

2014-10-16 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 08a868f2c -> 175d34777 Add DateTieredCompactionStrategy Patch by Bjorn Hegerfors; reviewed by marcuse for CASSANDRA-6602 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

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

2014-10-16 Thread marcuse
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/175d3477 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/175d3477 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-10-16 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: NEWS.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dea9839 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dea9839 Diff: http://gi

cassandra git commit: Make CompactionAwareWriterTest work with compression

2015-04-24 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 5023e620d -> e87008bb9 Make CompactionAwareWriterTest work with compression Patch by marcuse; reviewed by pcmanus for CASSANDRA-9225 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-04-26 Thread marcuse
Merge branch 'cassandra-2.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/12628893 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12628893 Diff: http:/

cassandra git commit: Make sstable blacklisting work with compression

2015-04-26 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 b325316f5 -> 917fabe23 Make sstable blacklisting work with compression Patch by marcuse; reviewed by Aleksey Yeschenko for CASSANDRA-9138 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[1/2] cassandra git commit: Make sstable blacklisting work with compression

2015-04-26 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 93b36d4b8 -> 12628893c Make sstable blacklisting work with compression Patch by marcuse; reviewed by Aleksey Yeschenko for CASSANDRA-9138 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-04-26 Thread marcuse
Merge branch 'cassandra-2.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/12628893 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12628893 Diff: http:/

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

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

[1/3] cassandra git commit: Make sstable blacklisting work with compression

2015-04-26 Thread marcuse
Repository: cassandra Updated Branches: refs/heads/trunk 246f07b68 -> d3b53aa42 Make sstable blacklisting work with compression Patch by marcuse; reviewed by Aleksey Yeschenko for CASSANDRA-9138 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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