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

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

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

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

[1/3] git commit: Add property to disable stcs in L0

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 047c67efb - a0bfdebca Add property to disable stcs in L0 Patch by marcuse; reviewed by tjake for CASSANDRA-6621 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

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

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

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

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

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

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

[1/4] git commit: Add property to disable stcs in L0

Repository: cassandra Updated Branches: refs/heads/trunk c58b2b28e - 72c08f11a Add property to disable stcs in L0 Patch by marcuse; reviewed by tjake for CASSANDRA-6621 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

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

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

git commit: Remove left-over rows_per_partition_to_cache

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 8c4ffbe65 - 28164849c Remove left-over rows_per_partition_to_cache Patch by marcuse; reviewed by jbellis for CASSANDRA-7493 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

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

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

[1/2] git commit: Remove left-over rows_per_partition_to_cache

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 a0bfdebca - 9a6cdf148 Remove left-over rows_per_partition_to_cache Patch by marcuse; reviewed by jbellis for CASSANDRA-7493 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

[1/3] git commit: Remove left-over rows_per_partition_to_cache

Repository: cassandra Updated Branches: refs/heads/trunk 72c08f11a - 4ea742cd0 Remove left-over rows_per_partition_to_cache Patch by marcuse; reviewed by jbellis for CASSANDRA-7493 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

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

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

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

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

git commit: Don't swap max/min column names when mutating sstable metadata.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 6f15fe260 - ee62ae104 Don't swap max/min column names when mutating sstable metadata. Patch by marcuse; reviewed by benedict for CASSANDRA-7596. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http

[1/2] git commit: Don't swap max/min column names when mutating sstable metadata.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 3744d7792 - 2236afb7a Don't swap max/min column names when mutating sstable metadata. Patch by marcuse; reviewed by benedict for CASSANDRA-7596. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git

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

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

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

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

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

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

git commit: Track min/max timestamps for range tombstones.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 b40cb0507 - 892bf5551 Track min/max timestamps for range tombstones. Patch by marcuse; reviewed by iamaleksey for CASSANDRA-7647 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

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

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

[1/2] git commit: Track min/max timestamps for range tombstones.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 ff992442a - c4d23e168 Track min/max timestamps for range tombstones. Patch by marcuse; reviewed by iamaleksey for CASSANDRA-7647 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[1/3] git commit: Track min/max timestamps for range tombstones.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 cc18e05ce - 3da7d9e25 Track min/max timestamps for range tombstones. Patch by marcuse; reviewed by iamaleksey for CASSANDRA-7647 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

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

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

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

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

[5/7] git commit: fix merge

fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cde56662 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cde56662 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cde56662 Branch:

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

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

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

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

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

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

[1/7] git commit: Track min/max timestamps for range tombstones.

Repository: cassandra Updated Branches: refs/heads/trunk da3fd5d7a - a88c7e10f Track min/max timestamps for range tombstones. Patch by marcuse; reviewed by iamaleksey for CASSANDRA-7647 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

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

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

[1/2] git commit: fix merge

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 3da7d9e25 - 40d7bdf80 fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cde56662 Tree:

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

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

git commit: fix merge

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 c4d23e168 - cde566629 fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cde56662 Tree:

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

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

git commit: Avoid NPE when listing saved caches directory

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

[1/2] git commit: Use a range aware scanner for cleanup to improve performance.

Updated Branches: refs/heads/trunk c651f8362 - a69457c14 Use a range aware scanner for cleanup to improve performance. Patch by thobbs, stuhood and marcuse, reviewed by marcuse for CASSANDRA-2524 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

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

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

git commit: Use a range aware scanner for cleanup to improve performance.

Updated Branches: refs/heads/cassandra-2.0 0fc15e5eb - 9e846d9ff Use a range aware scanner for cleanup to improve performance. Patch by thobbs, stuhood and marcuse, reviewed by marcuse for CASSANDRA-2524 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

git commit: Add all sstables to the leveled manifest on startup.

Updated Branches: refs/heads/cassandra-2.0.0 cd4718245 - 8f367fdf9 Add all sstables to the leveled manifest on startup. Patch by marcuse, reviewed by jbellis for CASSANDRA-5908 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

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

Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/857a7f5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/857a7f5f Diff:

[1/2] git commit: Add all sstables to the leveled manifest on startup.

Updated Branches: refs/heads/cassandra-2.0 c4f6be8c4 - 857a7f5fb Add all sstables to the leveled manifest on startup. Patch by marcuse, reviewed by jbellis for CASSANDRA-5908 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

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

Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/857a7f5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/857a7f5f Diff:

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

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

[1/3] git commit: Add all sstables to the leveled manifest on startup.

Updated Branches: refs/heads/trunk fe32c9744 - 7678661b0 Add all sstables to the leveled manifest on startup. Patch by marcuse, reviewed by jbellis for CASSANDRA-5908 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

git commit: fix build - log4j is gone

Updated Branches: refs/heads/trunk 8bc0f5990 - 3f5322f02 fix build - log4j is gone Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f5322f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f5322f0

git commit: Switch to LZ4 compression for internode communication.

Updated Branches: refs/heads/trunk 164f15866 - 14da6bca0 Switch to LZ4 compression for internode communication. Patch by marcuse, reviewed by jbellis for CASSANDRA-5887. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

git commit: Add missing CommitLogDescriptor version 21.

Updated Branches: refs/heads/trunk 87d5c019c - 5fd463184 Add missing CommitLogDescriptor version 21. Patch by cmolter, reviewed by marcuse for CASSANDRA-5984. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

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

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

[1/2] git commit: Make standalone scrubber handle both old and new style leveled manifest.

Updated Branches: refs/heads/trunk 3634eab1d - cabf0fa32 Make standalone scrubber handle both old and new style leveled manifest. Patch by marcuse, reviewed by jbellis for CASSANDRA-6005 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

git commit: Remove old json leveled manifest migration code.

Updated Branches: refs/heads/trunk cabf0fa32 - e546e3387 Remove old json leveled manifest migration code. Patch by marcuse, reviewed by jbellis for CASSANDRA-5996 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

git commit: Make standalone scrubber handle both old and new style leveled manifest.

Updated Branches: refs/heads/cassandra-2.0 c7881170b - fa70e064c Make standalone scrubber handle both old and new style leveled manifest. Patch by marcuse, reviewed by jbellis for CASSANDRA-6005 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

git commit: Enable tcp keepalive on incoming connections.

Updated Branches: refs/heads/cassandra-2.0 5817aa95c - 3448ca57f Enable tcp keepalive on incoming connections. Patch by marcuse, reviewed by jbellis for CASSANDRA-4053 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

[1/2] git commit: Enable tcp keepalive on incoming connections.

Updated Branches: refs/heads/trunk af4799b52 - 08e334649 Enable tcp keepalive on incoming connections. Patch by marcuse, reviewed by jbellis for CASSANDRA-4053 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

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

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

git commit: Create snapshot directory if it does not exist.

Updated Branches: refs/heads/cassandra-2.0 f2eaf9a13 - 102e9119b Create snapshot directory if it does not exist. patch by marcuse, reviewed by jbellis for CASSANDRA-6093 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

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

Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/LegacyLeveledManifest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be236eae Tree:

[1/2] git commit: Create snapshot directory if it does not exist.

Updated Branches: refs/heads/trunk c0d328bf0 - be236eae2 Create snapshot directory if it does not exist. patch by marcuse, reviewed by jbellis for CASSANDRA-6093 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

git commit: Use Atomic*FieldUpdater to save memory.

Updated Branches: refs/heads/trunk 8165af5db - 7aa3364e0 Use Atomic*FieldUpdater to save memory. Patch by marcuse, reviewed by belliottsmith for CASSANDRA-6281. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

git commit: Verify that the keyspace exists in describeRing and print nicer error message in BulkLoader.

Updated Branches: refs/heads/cassandra-2.0 95f1b5f29 - ae0a1e0f5 Verify that the keyspace exists in describeRing and print nicer error message in BulkLoader. Patch by marcuse, reviewed by thobbs for CASSANDRA-6529 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http

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

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

[1/2] git commit: Verify that the keyspace exists in describeRing and print nicer error message in BulkLoader.

Updated Branches: refs/heads/trunk 694988015 - 1dc43bdad Verify that the keyspace exists in describeRing and print nicer error message in BulkLoader. Patch by marcuse, reviewed by thobbs for CASSANDRA-6529 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git

git commit: Fix test.

Updated Branches: refs/heads/trunk 025b84efd - 1a24611ee Fix test. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a24611e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a24611e Diff:

git commit: 6503 followup, make sure we send CompleteMessage when streaming is done.

Updated Branches: refs/heads/cassandra-2.0 a8a12d9e0 - 1141cdb0c 6503 followup, make sure we send CompleteMessage when streaming is done. Patch by yukim, reviewed by marcuse for CASSANDRA-6503 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

git commit: Update to jamm-0.2.6

Updated Branches: refs/heads/trunk 811de14ec - e5ff1075c Update to jamm-0.2.6 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5ff1075 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5ff1075 Diff:

[1/2] git commit: Account for range and row tombstones in tombstone drop time histogram.

Updated Branches: refs/heads/trunk 7ce5e062e - 98e6b08c7 Account for range and row tombstones in tombstone drop time histogram. Patch by marcuse, reviewed by jbellis for CASSANDRA-6522 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

git commit: Account for range and row tombstones in tombstone drop time histogram.

Updated Branches: refs/heads/cassandra-2.0 e59ef16bf - 9fb44ee55 Account for range and row tombstones in tombstone drop time histogram. Patch by marcuse, reviewed by jbellis for CASSANDRA-6522 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

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

Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/ColumnFamily.java src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/2] Make it possible to cache a configurable amount of rows in row cache.

Updated Branches: refs/heads/trunk 98e6b08c7 - ab6eaed8f http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab6eaed8/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java -- diff --git

git commit: Update CHANGES for CASSANDRA-6522

Updated Branches: refs/heads/cassandra-2.0 862698cd5 - 933df01d2 Update CHANGES for CASSANDRA-6522 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/933df01d Tree:

[4/4] git commit: Update CHANGES after CASSANDRA-5357

Update CHANGES after CASSANDRA-5357 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/300b0263 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/300b0263 Diff:

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

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

[2/4] git commit: Update CHANGES for CASSANDRA-6522

Update CHANGES for CASSANDRA-6522 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/933df01d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/933df01d Diff:

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

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

[1/2] git commit: nope 6522 was not merged from 1.2

Updated Branches: refs/heads/trunk 300b02633 - ca00f622a nope 6522 was not merged from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21036468 Tree:

git commit: nope 6522 was not merged from 1.2

Updated Branches: refs/heads/cassandra-2.0 933df01d2 - 21036468c nope 6522 was not merged from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21036468 Tree:

[1/3] Avoid repairing already repaired data.

Updated Branches: refs/heads/trunk bcfaeaa9c - a7b72140b http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b72140/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java -- diff --git

git commit: Add missing files

Updated Branches: refs/heads/trunk a7b72140b - b75ed1c34 Add missing files Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b75ed1c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b75ed1c3 Diff:

[1/2] git commit: Fix CleanupTest

Updated Branches: refs/heads/cassandra-2.0 b5321d50b - 9a6ae96af Fix CleanupTest patch by marcuse, reviewed by jbellis for CASSANDRA-6679 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b83a6f9 Tree: http://git

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

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

git commit: Fix CleanupTest

Updated Branches: refs/heads/cassandra-1.2 c5627008a - 1b8b7b540 Fix CleanupTest patch by marcuse, reviewed by jbellis for CASSANDRA-6679 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b8b7b54 Tree: http://git

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

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: test/unit/org/apache/cassandra/db/CleanupTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a6ae96a Tree:

[1/3] git commit: Fix CleanupTest

Updated Branches: refs/heads/trunk 861d9960d - 503a8a865 Fix CleanupTest patch by marcuse, reviewed by jbellis for CASSANDRA-6679 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b83a6f9 Tree: http://git-wip

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

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: test/unit/org/apache/cassandra/db/CleanupTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a6ae96a Tree:

[1/2] git commit: Stop CommitLogSegment.close() from unnecessarily calling sync() prior to cleaning the buffer.

Updated Branches: refs/heads/trunk f05870ee8 - 7604935ef Stop CommitLogSegment.close() from unnecessarily calling sync() prior to cleaning the buffer. Patch by belliotsmith, reviewed by marcuse for CASSANDRA-6652 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http

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

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

git commit: Stop CommitLogSegment.close() from unnecessarily calling sync() prior to cleaning the buffer.

Updated Branches: refs/heads/cassandra-2.0 87aca600f - 55b5605b7 Stop CommitLogSegment.close() from unnecessarily calling sync() prior to cleaning the buffer. Patch by belliotsmith, reviewed by marcuse for CASSANDRA-6652 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit

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

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

[1/2] git commit: Add commit_failure_policy.

Updated Branches: refs/heads/trunk 7604935ef - a6e7d1405 Add commit_failure_policy. Patch by belliottsmith, reviewed by marcuse for CASSANDRA-6364 CASSANDRA-6364 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

git commit: Add commit_failure_policy.

Updated Branches: refs/heads/cassandra-2.0 55b5605b7 - 9381b8d56 Add commit_failure_policy. Patch by belliottsmith, reviewed by marcuse for CASSANDRA-6364 CASSANDRA-6364 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

[1/2] git commit: Avoid overlaps in LCS by not skipping levels and verifying that the candidates don't overlap any compacting sstables.

Updated Branches: refs/heads/trunk 4334f99f4 - 3aaa0295c Avoid overlaps in LCS by not skipping levels and verifying that the candidates don't overlap any compacting sstables. Patch by marcuse, reviewed by jbellis for CASSANDRA-6688 Project: http://git-wip-us.apache.org/repos/asf/cassandra

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

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

git commit: Avoid overlaps in LCS by not skipping levels and verifying that the candidates don't overlap any compacting sstables.

Updated Branches: refs/heads/cassandra-2.0 5f60fcc39 - 15ee94897 Avoid overlaps in LCS by not skipping levels and verifying that the candidates don't overlap any compacting sstables. Patch by marcuse, reviewed by jbellis for CASSANDRA-6688 Project: http://git-wip-us.apache.org/repos/asf

git commit: Add binary protocol versioning

Updated Branches: refs/heads/trunk 5d3b08ef1 - bf2ee0443 Add binary protocol versioning patch by marcuse, reviewed by pcmanus for CASSANDRA-5436 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf2ee044 Tree: http

git commit: Add helper to create sstables for legacy leveled manifest test

Updated Branches: refs/heads/cassandra-1.2 3c93e8c6b - 591b8ca4b Add helper to create sstables for legacy leveled manifest test Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/591b8ca4 Tree:

[1/3] git commit: Add helper to create sstables for legacy leveled manifest test

Updated Branches: refs/heads/trunk bf2ee0443 - 32f4e2cce Add helper to create sstables for legacy leveled manifest test Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/591b8ca4 Tree:

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

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

[3/3] git commit: Use new ic legacy sstables for legacy leveled manifest test

Use new ic legacy sstables for legacy leveled manifest test Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32f4e2cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32f4e2cc Diff:

git commit: fsync leveled manifest to avoid it getting corrupt

Updated Branches: refs/heads/cassandra-1.1 b4b4f6a95 - fe910e6c9 fsync leveled manifest to avoid it getting corrupt Patch by marcuse, reviewed by jbellis and carlyeks for CASSANDRA-5535 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

[1/2] git commit: fsync leveled manifest to avoid it getting corrupt

Updated Branches: refs/heads/cassandra-1.2 c007102c5 - ac1d7ee1c fsync leveled manifest to avoid it getting corrupt Patch by marcuse, reviewed by jbellis and carlyeks for CASSANDRA-5535 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

<    1   2   3   4   5   6   7   8   9   10   >