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

Merge branch 'cassandra-1.1' into cassandra-1.2 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/ac1d7ee1 Tree:

[1/5] git commit: Update version for 1.2.5 release

Updated Branches: refs/heads/trunk b505b90a8 - ec5f416a4 Update version for 1.2.5 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de985417 Tree:

[2/5] git commit: fix repair test after CASSANDRA-5523

fix repair test after CASSANDRA-5523 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c007102c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c007102c Diff:

[3/5] git commit: fsync leveled manifest to avoid it getting corrupt

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/asf/cassandra/commit/fe910e6c Tree: http://git-wip-us.apache.org

[4/5] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 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/ac1d7ee1 Tree:

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

Merge branch 'cassandra-1.2' into trunk Conflicts: build.xml src/java/org/apache/cassandra/db/compaction/LeveledManifest.java test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo

git commit: fix bad merge

Updated Branches: refs/heads/trunk ec5f416a4 - 90764b0ac fix bad merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90764b0a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90764b0a Diff:

git commit: add support for bind variables to non-prepared statements.

Updated Branches: refs/heads/trunk 3c06ff0a8 - df723af8a add support for bind variables to non-prepared statements. patch by marcuse, reviewed by pcmanus for CASSANDRA-5349 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

git commit: Dont throw UOE when calling shouldInclude in NamesQueryFilter - include all files instead

Updated Branches: refs/heads/trunk 0ad499e9a - d106950ec Dont throw UOE when calling shouldInclude in NamesQueryFilter - include all files instead Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d106950e Tree:

git commit: fix bug in intersection checking, and improve collection of max/min column

Updated Branches: refs/heads/trunk 496035585 - 1ea5059fe fix bug in intersection checking, and improve collection of max/min column Patch by marcuse, reviewed by pcmanus for CASSANDRA-5600 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

git commit: another try at fixing the broken testMutateLevel test

Updated Branches: refs/heads/trunk 8b908c0ac - 62295f68c another try at fixing the broken testMutateLevel test Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62295f68 Tree:

git commit: Don't keep ancestor information in memory since it is only used on startup.

Updated Branches: refs/heads/cassandra-1.2 cc9ac8277 - 83b75754f Don't keep ancestor information in memory since it is only used on startup. patch by marcuse, reviewed by jbellis for CASSANDRA-5342 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[1/2] git commit: Don't keep ancestor information in memory since it is only used on startup.

Updated Branches: refs/heads/trunk 1a2f35731 - 07ca445e5 Don't keep ancestor information in memory since it is only used on startup. patch by marcuse, reviewed by jbellis for CASSANDRA-5342 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.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/bbf3cc51 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbf3cc51 Diff:

[1/2] git commit: Use Java7 file APIs to get saner exceptions etc.

Updated Branches: refs/heads/trunk 6dda6f2d8 - bbf3cc516 Use Java7 file APIs to get saner exceptions etc. And since windows does not support moving a file on top of another existing file, remove the old file before moving. Patch by marcuse, reviewed by jbellis for CASSANDRA-5383. Project

git commit: Use Java7 file APIs to get saner exceptions etc.

Updated Branches: refs/heads/cassandra-2.0 213f6bb88 - 8dfd75de1 Use Java7 file APIs to get saner exceptions etc. And since windows does not support moving a file on top of another existing file, remove the old file before moving. Patch by marcuse, reviewed by jbellis for CASSANDRA-5383

git commit: fix merge

Updated Branches: refs/heads/trunk a9d64ef86 - 6bcf28edc fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bcf28ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bcf28ed Diff:

[1/2] git commit: really fix build this time

Updated Branches: refs/heads/trunk 6bcf28edc - 3f8a90aa4 really fix build this time Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91bd207f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91bd207f

git commit: really fix build this time

Updated Branches: refs/heads/cassandra-2.0 4dc5d690f - 91bd207ff really fix build this time Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91bd207f Tree:

[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/3f8a90aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f8a90aa Diff:

git commit: Revert remove decompression code in CompressedSequentialWriter

Updated Branches: refs/heads/cassandra-2.0 cfa0e580e - 232906d7e Revert remove decompression code in CompressedSequentialWriter This reverts commit 9644f098967d6ba9154725148a383b3502ef62c2. 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/656d3240 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/656d3240 Diff:

[1/2] git commit: Revert remove decompression code in CompressedSequentialWriter

Updated Branches: refs/heads/trunk 302055583 - 656d3240f Revert remove decompression code in CompressedSequentialWriter This reverts commit 9644f098967d6ba9154725148a383b3502ef62c2. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

git commit: Use AtomicIntegerFieldUpdater in RefCountedMemory to save memory in row cache.

Updated Branches: refs/heads/trunk 69fef1977 - 7918718c8 Use AtomicIntegerFieldUpdater in RefCountedMemory to save memory in row cache. Patch by marcuse, reviewed by jbellis for CASSANDRA-6278 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

git commit: Set minTimestamp correctly to be able to drop expired sstables correctly

Updated Branches: refs/heads/cassandra-2.0 5008507ca - e02341b38 Set minTimestamp correctly to be able to drop expired sstables correctly patch by marcuse, reviewed by jbellis for CASSANDRA-6337 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/b92c55e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b92c55e6 Diff:

[1/2] git commit: Set minTimestamp correctly to be able to drop expired sstables correctly

Updated Branches: refs/heads/trunk cb871ba90 - b92c55e68 Set minTimestamp correctly to be able to drop expired sstables correctly patch by marcuse, reviewed by jbellis for CASSANDRA-6337 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

git commit: Fix CQLSSTableWriterTest

Updated Branches: refs/heads/cassandra-2.0 2af076494 - 4fae76c14 Fix CQLSSTableWriterTest Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4fae76c1 Tree:

[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/f1a67a06 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1a67a06 Diff:

[1/2] git commit: Fix CQLSSTableWriterTest

Updated Branches: refs/heads/trunk ed0c91ee4 - f1a67a06a Fix CQLSSTableWriterTest Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4fae76c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4fae76c1 Diff:

git commit: fix MoveTest

Updated Branches: refs/heads/cassandra-1.2 f634ac7ea - d8c4e89b3 fix MoveTest Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8c4e89b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8c4e89b 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/e4d44724 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4d44724 Diff:

[1/2] git commit: fix MoveTest

Updated Branches: refs/heads/cassandra-2.0 1334f94e4 - 32dbe5825 fix MoveTest Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8c4e89b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8c4e89b Diff:

[1/3] git commit: fix MoveTest

Updated Branches: refs/heads/trunk b34d43f97 - e4d447240 fix MoveTest Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8c4e89b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8c4e89b Diff:

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

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

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

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

[2/2] 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/e4148684 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4148684 Diff:

[1/2] git commit: Scrub should not always clear out repaired status.

Repository: cassandra Updated Branches: refs/heads/trunk 3b45d004c - e41486847 Scrub should not always clear out repaired status. Patch by marcuse, reviewed by jbellis for CASSANDRA-5351 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

git commit: Scrub should not always clear out repaired status.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e30f11143 - f0c9bd1c9 Scrub should not always clear out repaired status. Patch by marcuse, reviewed by jbellis for CASSANDRA-5351 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

git commit: Fix resetAndTruncate:ing CompressionMetadata

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 b3a9a4434 - 41d8a5f48 Fix resetAndTruncate:ing CompressionMetadata Patch by kvaster, reviewed by marcuse for CASSANDRA-6791 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

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

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

[1/3] git commit: Fix resetAndTruncate:ing CompressionMetadata

Repository: cassandra Updated Branches: refs/heads/trunk 7d8092b66 - e80564f39 Fix resetAndTruncate:ing CompressionMetadata Patch by kvaster, reviewed by marcuse for CASSANDRA-6791 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

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/e4437bc1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4437bc1 Diff:

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

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/e4437bc1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4437bc1 Diff:

[1/2] git commit: Fix resetAndTruncate:ing CompressionMetadata

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 dcca99684 - e4437bc18 Fix resetAndTruncate:ing CompressionMetadata Patch by kvaster, reviewed by marcuse for CASSANDRA-6791 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

git commit: Fix merge

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e4437bc18 - 043953127 Fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04395312 Tree:

[2/2] 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/2c8100af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c8100af Diff:

[1/2] git commit: Fix merge

Repository: cassandra Updated Branches: refs/heads/trunk e80564f39 - 2c8100af2 Fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04395312 Tree:

git commit: Fix resetAndTruncate:ing CompressionMetadata

Repository: cassandra Updated Branches: refs/heads/cassandra-1.2 f08ae394f - 64098f7d6 Fix resetAndTruncate:ing CompressionMetadata Patch by kvaster, reviewed by marcuse for CASSANDRA-6791 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-1.2' into cassandra-2.0

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

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

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

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

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

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

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

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

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

[1/2] git commit: Fix resetAndTruncate:ing CompressionMetadata

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 41d8a5f48 - ef20671c2 Fix resetAndTruncate:ing CompressionMetadata Patch by kvaster, reviewed by marcuse for CASSANDRA-6791 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

[1/3] git commit: Fix resetAndTruncate:ing CompressionMetadata

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 043953127 - 56631e139 Fix resetAndTruncate:ing CompressionMetadata Patch by kvaster, reviewed by marcuse for CASSANDRA-6791 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

[1/4] git commit: Fix resetAndTruncate:ing CompressionMetadata

Repository: cassandra Updated Branches: refs/heads/trunk 2c8100af2 - db6b563f1 Fix resetAndTruncate:ing CompressionMetadata Patch by kvaster, reviewed by marcuse for CASSANDRA-6791 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

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

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

git commit: Update syntax for changing caching options.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 ad5169d2f - da444a690 Update syntax for changing caching options. Patch by marcuse, reviewed by slebresne for CASSANDRA-6745. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

[1/2] git commit: Update syntax for changing caching options.

Repository: cassandra Updated Branches: refs/heads/trunk a03ac8d07 - 346d8fb6d Update syntax for changing caching options. Patch by marcuse, reviewed by slebresne for CASSANDRA-6745. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/cql/AlterTableStatement.java src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

git commit: fixed bug in CompactionManager.needsCleanup

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 19444ea16 - 05da045bb fixed bug in CompactionManager.needsCleanup Patch by Dmitrij Koniajev, reviewed by marcuse for CASSANDRA-6845. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

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

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/019e3386 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/019e3386 Diff:

[1/2] git commit: fixed bug in CompactionManager.needsCleanup

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 cf9ae5f9c - 019e33867 fixed bug in CompactionManager.needsCleanup Patch by Dmitrij Koniajev, reviewed by marcuse for CASSANDRA-6845. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[1/3] git commit: fixed bug in CompactionManager.needsCleanup

Repository: cassandra Updated Branches: refs/heads/trunk c4b2320ae - 4f525b3a8 fixed bug in CompactionManager.needsCleanup Patch by Dmitrij Koniajev, reviewed by marcuse for CASSANDRA-6845. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

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

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/019e3386 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/019e3386 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/4f525b3a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f525b3a Diff:

git commit: Read message id as string from older nodes.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 c49d33633 - c3aac4560 Read message id as string from older nodes. Patch by marcuse, reviewed by jbellis for CASSANDRA-6840 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.0' into cassandra-2.1

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

[1/2] git commit: Read message id as string from older nodes.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 ace0e6e1d - 74ac6e896 Read message id as string from older nodes. Patch by marcuse, reviewed by jbellis for CASSANDRA-6840 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

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

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

[1/3] git commit: Read message id as string from older nodes.

Repository: cassandra Updated Branches: refs/heads/trunk 79e3217f9 - 59695a254 Read message id as string from older nodes. Patch by marcuse, reviewed by jbellis for CASSANDRA-6840 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

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

git commit: Add paranoid disk failure option.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 b4f2ff17a - 850cd59ca Add paranoid disk failure option. Patch by marcuse, reviewed by kohlisankalp and jbellis for CASSANDRA-6646 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[1/2] git commit: Add paranoid disk failure option.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 815892e8c - 35b215136 Add paranoid disk failure option. Patch by marcuse, reviewed by kohlisankalp and jbellis for CASSANDRA-6646 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

Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/service/CassandraDaemon.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/35b21513 Tree:

[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/6e66cf5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e66cf5f Diff:

[1/3] git commit: Add paranoid disk failure option.

Repository: cassandra Updated Branches: refs/heads/trunk f3b2a6bcb - 6e66cf5f2 Add paranoid disk failure option. Patch by marcuse, reviewed by kohlisankalp and jbellis for CASSANDRA-6646 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.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/service/CassandraDaemon.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/35b21513 Tree:

git commit: Improve nodetool cleanup/scrub/upgradesstables failure handling.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 35b215136 - 17945ab0d Improve nodetool cleanup/scrub/upgradesstables failure handling. Patch by marcuse, reviewed by jbellis for CASSANDRA-6774 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git

[1/2] git commit: Improve nodetool cleanup/scrub/upgradesstables failure handling.

Repository: cassandra Updated Branches: refs/heads/trunk 6e66cf5f2 - 5b88a0f62 Improve nodetool cleanup/scrub/upgradesstables failure handling. Patch by marcuse, reviewed by jbellis for CASSANDRA-6774 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

[2/2] 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/5b88a0f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b88a0f6 Diff:

[1/4] ByteBuffer write() methods for serializing sstables

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 2a2141ce6 - 75508ec89 http://git-wip-us.apache.org/repos/asf/cassandra/blob/75508ec8/test/unit/org/apache/cassandra/utils/FastByteOperationsTest.java -- diff

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

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

[1/5] ByteBuffer write() methods for serializing sstables

Repository: cassandra Updated Branches: refs/heads/trunk 00317fc8f - 9f057832e http://git-wip-us.apache.org/repos/asf/cassandra/blob/75508ec8/test/unit/org/apache/cassandra/utils/FastByteOperationsTest.java -- diff --git

git commit: Make OpOrder AutoCloseable

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 53e22120d - 269f81052 Make OpOrder AutoCloseable Patch by benedict, reviewed by marcuse for CASSANDRA-6901. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

[1/2] git commit: Make OpOrder AutoCloseable

Repository: cassandra Updated Branches: refs/heads/trunk 74290df23 - 0b68b6dd7 Make OpOrder AutoCloseable Patch by benedict, reviewed by marcuse for CASSANDRA-6901. 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.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/0b68b6dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b68b6dd Diff:

git commit: Remove avro usage in DataOutputTest

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 fbc112d4b - 5baa72f7f Remove avro usage in DataOutputTest Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5baa72f7 Tree:

[1/2] git commit: Remove avro usage in DataOutputTest

Repository: cassandra Updated Branches: refs/heads/trunk 6f24097f6 - 6838790f8 Remove avro usage in DataOutputTest Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5baa72f7 Tree:

[2/2] 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/6838790f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6838790f Diff:

git commit: Make sure we keep the sstable level when running upgradesstables.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 0fce7ace0 - a90b98e90 Make sure we keep the sstable level when running upgradesstables. Patch by marcuse; reviewed by yukim for CASSANDRA-6958 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

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/26191ca6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26191ca6 Diff:

[1/2] git commit: Make sure we keep the sstable level when running upgradesstables.

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e5639f44c - 26191ca69 Make sure we keep the sstable level when running upgradesstables. Patch by marcuse; reviewed by yukim for CASSANDRA-6958 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git

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

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/26191ca6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26191ca6 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/5cdfa69c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cdfa69c Diff:

[1/3] git commit: Make sure we keep the sstable level when running upgradesstables.

Repository: cassandra Updated Branches: refs/heads/trunk 3b1423945 - 5cdfa69ca Make sure we keep the sstable level when running upgradesstables. Patch by marcuse; reviewed by yukim for CASSANDRA-6958 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip

git commit: Don't break API in minor rev, followup to CASSANDRA-6958

Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 55fba6ab0 - 80b3e6cc3 Don't break API in minor rev, followup to CASSANDRA-6958 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/80b3e6cc Tree:

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

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

[1/2] git commit: Don't break API in minor rev, followup to CASSANDRA-6958

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 d6b582614 - 92b40fd90 Don't break API in minor rev, followup to CASSANDRA-6958 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/80b3e6cc Tree:

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