cassandra git commit: Fix ColumnFamilyStoreTest.testSliceByNamesCommandOldMetadata

2015-05-29 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 fdecab038 -> 06e742fc7 Fix ColumnFamilyStoreTest.testSliceByNamesCommandOldMetadata Patch by jmckenzie; reviewed by jbellis for CASSANDRA-9501 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

cassandra git commit: Change default GC to G1

2015-05-28 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk de0dcde6b -> ea36ae9e8 Change default GC to G1 Patch by Al Tobey; reviewed by jmckenzie for CASSANDRA-7486 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/com

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

2015-05-26 Thread jmckenzie
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/747e1005 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/747e1005 Diff: http://git-wip-us.apache.org/repos/asf/cassand

cassandra git commit: Add Windows support to NEWS.txt

2015-05-26 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 248ea0b34 -> c17e44a79 Add Windows support to NEWS.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c17e44a7 Tree: http://git-wip-us.apache.org/re

[1/2] cassandra git commit: Add Windows support to NEWS.txt

2015-05-26 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk f5f8806c4 -> 747e1005b Add Windows support to NEWS.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c17e44a7 Tree: http://git-wip-us.apache.org/repos/asf/

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

2015-05-26 Thread jmckenzie
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ec7594f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ec7594f Diff: http://git-wip-us.apache.org/repos/asf/cassand

[1/2] cassandra git commit: Improve ByteBuffer compression interface

2015-05-26 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk b23e91f82 -> 2ec7594fd Improve ByteBuffer compression interface Patch by blambov; reviewed by jmckenzie for CASSANDRA-9096 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

cassandra git commit: Improve ByteBuffer compression interface

2015-05-26 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 28afa1c27 -> 3adfd1575 Improve ByteBuffer compression interface Patch by blambov; reviewed by jmckenzie for CASSANDRA-9096 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.2' into trunk

2015-05-15 Thread jmckenzie
Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9260ca8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9260ca8f Diff: http://git-wip-us.apache.org/repos/asf/cassand

[1/2] cassandra git commit: Commit 9214 on 2.2 branch

2015-05-15 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 3ae97ba52 -> 9260ca8f5 Commit 9214 on 2.2 branch Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63f59672 Tree: http://git-wip-us.apache.org/repos/asf/cassan

cassandra git commit: Commit 9214 on 2.2 branch

2015-05-15 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 1937bed90 -> 63f596727 Commit 9214 on 2.2 branch Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63f59672 Tree: http://git-wip-us.apache.org/repos/as

cassandra git commit: Update v4 spec w/date and time, fix bounds check on TimeSerializer

2015-05-15 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk da90e6079 -> 3ae97ba52 Update v4 spec w/date and time, fix bounds check on TimeSerializer Patch by jmckenzie; reviewed by Aleksey Yeschenko for CASSANDRA-9214 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: h

cassandra git commit: Fix date and time entries in NEWS.txt

2015-05-15 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk d4419ffe0 -> 6c489afed Fix date and time entries in NEWS.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c489afe Tree: http://git-wip-us.apache.org/repo

cassandra git commit: Follow-up for 7523: prevent old clients from getting new type codes.

2015-05-14 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk b2abcb7fc -> 4a5c282f7 Follow-up for 7523: prevent old clients from getting new type codes. Patch by jmckenzie; reviewed by Aleksey Yeschenko for CASSANDRA-9219 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Com

[1/2] cassandra git commit: Fix JVM_EXTRA_OPTS in Windows startup scripts

2015-05-08 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 86f481ef9 -> e9d1e7994 Fix JVM_EXTRA_OPTS in Windows startup scripts Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9335 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.1' into trunk

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

cassandra git commit: Fix JVM_EXTRA_OPTS in Windows startup scripts

2015-05-08 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 ef8dc6715 -> a431d846c Fix JVM_EXTRA_OPTS in Windows startup scripts Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9335 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

cassandra git commit: Fix SSTableRewriterTest when run with compression.

2015-05-08 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 4190c9dc2 -> 3ef932af7 Fix SSTableRewriterTest when run with compression. Patch by aweisberg; reviewed by jmckenzie for CASSANDRA-9277 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

[3/3] cassandra git commit: (2.1+) Fix remote debugging configuration

2015-05-05 Thread jmckenzie
(2.1+) Fix remote debugging configuration Patch by blerer; reviewed by jmckenzie for CASSANDRA-9297 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/233ef340 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[1/4] cassandra git commit: Fix remote debugging configuration

2015-05-05 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk afb52aa9a -> bf21df2c3 Fix remote debugging configuration Patch by blerer; reviewed by jmckenzie for CASSANDRA-9297 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

cassandra git commit: Fix remote debugging configuration

2015-05-05 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 dbb36a476 -> 9b77cdea7 Fix remote debugging configuration Patch by blerer; reviewed by jmckenzie for CASSANDRA-9297 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

[3/4] cassandra git commit: (2.1+) Fix remote debugging configuration

2015-05-05 Thread jmckenzie
(2.1+) Fix remote debugging configuration Patch by blerer; reviewed by jmckenzie for CASSANDRA-9297 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/233ef340 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2015-05-05 Thread jmckenzie
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/95eb2a12 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95eb2a12 Diff: http://git-wip-us.apache.org/repos/asf

[1/3] cassandra git commit: Fix remote debugging configuration

2015-05-05 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 4c7c5be79 -> 233ef3403 Fix remote debugging configuration Patch by blerer; reviewed by jmckenzie for CASSANDRA-9297 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

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

2015-05-05 Thread jmckenzie
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/95eb2a12 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95eb2a12 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-05-05 Thread jmckenzie
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/bf21df2c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf21df2c Diff: http://git-wip-us.apache.org/repos/asf/cassand

cassandra git commit: Follow-up #2 for 9104. Fix SchemaLoader + EmbeddedCassandraServer recover case

2015-04-30 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 90476352a -> 774bd0bce Follow-up #2 for 9104. Fix SchemaLoader + EmbeddedCassandraServer recover case Patch by jmckenzie; reviewed by branimir for CASSANDRA-9104 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Com

cassandra git commit: Disable memory mapping of hsperfdata files for JVM statistics

2015-04-29 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 1f3ab8109 -> 33f37f86f Disable memory mapping of hsperfdata files for JVM statistics Patch by Ariel Weisberg; reviewed by jmckenzie for CASSANDRA-9242 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

cassandra git commit: Followup for CASSANDRA-9104 - remove redundant recover calls in tests

2015-04-24 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk e87008bb9 -> d9fcb3974 Followup for CASSANDRA-9104 - remove redundant recover calls in tests Patch by jmckenzie; reviewed by branimir for CASSANDRA-9104 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

cassandra git commit: Fix various unit-test failures

2015-04-22 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk e6bc6385a -> 3510bdb50 Fix various unit-test failures Patch by jmckenzie; reviewed by branimir for CASSANDRA-9104 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: Revert "Add date and time types" on 2.1 branch

2015-04-21 Thread jmckenzie
Revert "Add date and time types" on 2.1 branch This reverts commit 107545b3929c32c61e7d00c6ca448c10046db792. Conflicts: CHANGES.txt NEWS.txt bin/cqlsh pylib/cqlshlib/test/test_keyspace_init.cql Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit

[1/3] cassandra git commit: Revert "Add date and time types" on 2.1 branch

2015-04-21 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 1e8c5e0a1 -> 727c5c832 http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f29201c/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java -- diff --g

[2/3] cassandra git commit: Revert "Add date and time types" on 2.1 branch

2015-04-21 Thread jmckenzie
Revert "Add date and time types" on 2.1 branch This reverts commit 107545b3929c32c61e7d00c6ca448c10046db792. Conflicts: CHANGES.txt NEWS.txt bin/cqlsh pylib/cqlshlib/test/test_keyspace_init.cql Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit

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

2015-04-21 Thread jmckenzie
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/727c5c83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/727c5c83 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[1/2] cassandra git commit: Revert "Add date and time types" on 2.1 branch

2015-04-21 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 f18fb0445 -> 7f29201ce http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f29201c/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java --

cassandra git commit: Fix SSTableRewriter test on Windows

2015-04-09 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk eff80ff09 -> d908bf431 Fix SSTableRewriter test on Windows Patch by stefania; reviewed by jmckenzie for CASSANDRA-8962 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

cassandra git commit: Remove transient RAF usage

2015-04-03 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 51908e240 -> 75409a185 Remove transient RAF usage Patch by stefania; reviewed by jmckenzie for CASSANDRA-8952 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassan

[2/5] cassandra git commit: Fix potential data loss in CompressedSequentialWriter (2.1 patch)

2015-03-24 Thread jmckenzie
Fix potential data loss in CompressedSequentialWriter (2.1 patch) Patch by jmckenzie; reviewed by tjake for CASSANDRA-8949 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ff82706 Tree: http://git-wip-us.apache.org

[5/5] cassandra git commit: ninja - clean up merge diff

2015-03-24 Thread jmckenzie
ninja - clean up merge diff Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/507a3630 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/507a3630 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/507a

[1/5] cassandra git commit: Fix potential data loss in CompressedSequentialWriter

2015-03-24 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk dadc206c6 -> 507a36305 Fix potential data loss in CompressedSequentialWriter Patch by jmckenzie; reviewed by tjake for CASSANDRA-8949 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

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

2015-03-24 Thread jmckenzie
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/5639eac1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5639eac1 Diff: http://git-wip-us.apache.org/repos/asf

[2/3] cassandra git commit: Fix potential data loss in CompressedSequentialWriter (2.1 patch)

2015-03-24 Thread jmckenzie
Fix potential data loss in CompressedSequentialWriter (2.1 patch) Patch by jmckenzie; reviewed by tjake for CASSANDRA-8949 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ff82706 Tree: http://git-wip-us.apache.org

[1/3] cassandra git commit: Fix potential data loss in CompressedSequentialWriter

2015-03-24 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9d2b2730e -> 5639eac1a Fix potential data loss in CompressedSequentialWriter Patch by jmckenzie; reviewed by tjake for CASSANDRA-8949 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

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

cassandra git commit: Fix potential data loss in CompressedSequentialWriter

2015-03-24 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 061ea33fd -> f5f97d815 Fix potential data loss in CompressedSequentialWriter Patch by jmckenzie; reviewed by tjake for CASSANDRA-8949 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2015-03-24 Thread jmckenzie
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/5639eac1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5639eac1 Diff: http://git-wip-us.apache.org/repos/asf

[1/2] cassandra git commit: Fix SSTableRewriter when early re-open disabled

2015-03-13 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 994d8f503 -> 5d6f9284f Fix SSTableRewriter when early re-open disabled Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8535 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

cassandra git commit: Fix SSTableRewriter when early re-open disabled

2015-03-13 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9caf0457a -> d97e7cb69 Fix SSTableRewriter when early re-open disabled Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8535 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-13 Thread jmckenzie
Merge branch 'cassandra-2.1' into trunk 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/5d6f9284 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d6f9284 Diff: http://git-wip

cassandra git commit: Expose commit log archiver status via JMX

2015-03-12 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 d6ea0ff1f -> 77c66bf9f Expose commit log archiver status via JMX Patch by clohfink; reviewed by jmckenzie for CASSANDRA-8734 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

cassandra git commit: Convert SequentialWriter to nio

2015-03-11 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk c38ea0b1b -> bc7941c9d Convert SequentialWriter to nio Patch by jmckenzie; reviewed by tjake for CASSANDRA-8709 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassan

[2/5] cassandra git commit: Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1

2015-03-11 Thread jmckenzie
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra 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/2047b2ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[1/2] cassandra git commit: Expose commit log archiver status via JMX

2015-03-11 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 2047b2ae3 -> 8eea35863 Expose commit log archiver status via JMX Patch by clohfink; reviewed by jmckenzie for CASSANDRA-8734 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.

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

2015-03-11 Thread jmckenzie
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/db/commitlog/CommitLog.java src/java/org/apache/cassandra/db/commitlog/CommitLogMBean.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/as

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

2015-03-11 Thread jmckenzie
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/commitlog/CommitLog.java src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.o

[1/5] cassandra git commit: Uncomment wrongly commented tests

2015-03-11 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 39deb31c4 -> c38ea0b1b Uncomment wrongly commented tests Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/699b5752 Tree: http://git-wip-us.apache.org/repos/as

[3/5] cassandra git commit: Expose commit log archiver status via JMX

2015-03-11 Thread jmckenzie
Expose commit log archiver status via JMX Patch by clohfink; reviewed by jmckenzie for CASSANDRA-8734 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77c66bf9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra

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

2015-03-11 Thread jmckenzie
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/commitlog/CommitLog.java src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.o

cassandra git commit: Cleanup of generics in bounds serialization

2015-03-10 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 05a6f2667 -> 69542a99c Cleanup of generics in bounds serialization Patch by blambov; reviewed by jmckenzie for CASSANDRA-8375 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-03-09 Thread jmckenzie
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/b426963e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b426963e Diff: http://git-wip-us.apache.org/repos/asf/cassand

cassandra git commit: Make logging for NPE in removeUnfinishedCompactionLeftovers more useful

2015-03-09 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 107545b39 -> 9ee34b6e6 Make logging for NPE in removeUnfinishedCompactionLeftovers more useful Patch by jmckenzie; reviewed by ayeschenko for CASSANDRA-8544 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Com

[1/2] cassandra git commit: Make logging for NPE in removeUnfinishedCompactionLeftovers more useful

2015-03-09 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 3d11ec5dd -> b426963eb Make logging for NPE in removeUnfinishedCompactionLeftovers more useful Patch by jmckenzie; reviewed by ayeschenko for CASSANDRA-8544 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: h

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

2015-03-09 Thread jmckenzie
Merge branch 'cassandra-2.1' into trunk Conflicts: pylib/cqlshlib/cql3handling.py Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d11ec5d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d11ec5d D

[2/2] cassandra git commit: Add date and time types

2015-03-09 Thread jmckenzie
Add date and time types Patch by jmckenzie; reviewed by thobbs and cyeksigian for CASSANDRA-7523 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/107545b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[2/3] cassandra git commit: Add date and time types

2015-03-09 Thread jmckenzie
Add date and time types Patch by jmckenzie; reviewed by thobbs and cyeksigian for CASSANDRA-7523 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/107545b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[1/2] cassandra git commit: Add date and time types

2015-03-09 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 2e3a28777 -> 107545b39 http://git-wip-us.apache.org/repos/asf/cassandra/blob/107545b3/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java --

[1/3] cassandra git commit: Add date and time types

2015-03-09 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 66a5d3bbe -> 3d11ec5dd http://git-wip-us.apache.org/repos/asf/cassandra/blob/107545b3/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java -- diff --g

[1/2] cassandra git commit: Add ability to limit number of native connections

2015-03-05 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 790256825 -> b1c2536cc Add ability to limit number of native connections Patch by Norman Maurer; reviewed by jmckenzie for CASSANDRA-8086 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[1/3] cassandra git commit: Add ability to limit number of native connections

2015-03-05 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 0d2ec11c7 -> ac75ce3e9 Add ability to limit number of native connections Patch by Norman Maurer; reviewed by jmckenzie for CASSANDRA-8086 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-03-05 Thread jmckenzie
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/b1c2536c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1c2536c Diff: http:/

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

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

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

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

cassandra git commit: Add ability to limit number of native connections

2015-03-05 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 2428b9c55 -> e56d9efb7 Add ability to limit number of native connections Patch by Norman Maurer; reviewed by jmckenzie for CASSANDRA-8086 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

cassandra git commit: Further refining CommitLog* restart for Windows CI unit tests

2015-02-18 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk c1a248a43 -> 2732752be Further refining CommitLog* restart for Windows CI unit tests Patch by rstupp; reviewed by jmckenzie as follow up to CASSANDRA-8308 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: h

cassandra git commit: Fix version check on CommitLogArchiver restore

2015-01-30 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 0b324c5e5 -> 24a189ca6 Fix version check on CommitLogArchiver restore Patch by jmckenzie; reviewed by Sam Tunnicliffe for CASSANDRA-8293 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-01-14 Thread jmckenzie
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/c65a9f5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c65a9f5c Diff: http://git-wip-us.apache.org/repos/asf/cassand

[1/2] cassandra git commit: Remove JVMStabilityInspector from hadoop code

2015-01-14 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 2fc9f3292 -> c65a9f5c6 Remove JVMStabilityInspector from hadoop code Patch by jmckenzie; reviewed by bwilliams as follow-up for CASSANDRA-8292 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

cassandra git commit: Remove JVMStabilityInspector from hadoop code

2015-01-14 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 7804a53c9 -> 2ff913767 Remove JVMStabilityInspector from hadoop code Patch by jmckenzie; reviewed by bwilliams as follow-up for CASSANDRA-8292 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

cassandra git commit: Fix SSTableRewriterTest on Windows

2015-01-14 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 88b51539f -> 2fc9f3292 Fix SSTableRewriterTest on Windows Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8598 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/

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

2015-01-08 Thread jmckenzie
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/commitlog/CommitLog.java test/unit/org/apache/cassandra/db/CommitLogTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/

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

2015-01-08 Thread jmckenzie
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/commitlog/CommitLog.java test/unit/org/apache/cassandra/db/CommitLogTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/

[1/2] cassandra git commit: Prevent CommitLogTest failures from cascading

2015-01-08 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 5ac5ee666 -> fb9530948 Prevent CommitLogTest failures from cascading Patch by Bogdan Kanivets; reviewed by jmckenzie for CASSANDRA-7713 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-01-08 Thread jmckenzie
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/dd84a29b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd84a29b Diff: http://git-wip-us.apache.org/repos/asf/cassand

[1/3] cassandra git commit: Prevent CommitLogTest failures from cascading

2015-01-08 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 39a2410ad -> dd84a29b2 Prevent CommitLogTest failures from cascading Patch by Bogdan Kanivets; reviewed by jmckenzie for CASSANDRA-7713 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

cassandra git commit: Prevent CommitLogTest failures from cascading

2015-01-08 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 ad3753309 -> 5e797ebba Prevent CommitLogTest failures from cascading Patch by Bogdan Kanivets; reviewed by jmckenzie for CASSANDRA-7713 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

cassandra git commit: ninja - correct comment in CommitLogSegment

2015-01-08 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 2b4029a76 -> 39a2410ad ninja - correct comment in CommitLogSegment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39a2410a Tree: http://git-wip-us.apache.or

cassandra git commit: Switch CommitLogSegment from RandomAccessFile to nio

2015-01-08 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 028fd2950 -> 2b4029a76 Switch CommitLogSegment from RandomAccessFile to nio Patch by jmckenzie; reviewed by belliottsmith for CASSANDRA-8308 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-01-07 Thread jmckenzie
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionTask.java src/java/org/apache/cassandra/io/sstable/format/big/BigTableScanner.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apa

[1/2] cassandra git commit: Remove ref counting in SSTableScanner, fix CompactionTask ordering

2015-01-07 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 493859bf6 -> 65ffc39b1 Remove ref counting in SSTableScanner, fix CompactionTask ordering Patch by jmckenzie; reviewed by belliottsmith as a follow-up for CASSANDRA-8399 Project: http://git-wip-us.apache.org/repos/asf/cassandra/r

cassandra git commit: Remove ref counting in SSTableScanner, fix CompactionTask ordering

2015-01-07 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 ddca610c9 -> bdbb071f4 Remove ref counting in SSTableScanner, fix CompactionTask ordering Patch by jmckenzie; reviewed by belliottsmith as a follow-up for CASSANDRA-8399 Project: http://git-wip-us.apache.org/repos/

[1/2] cassandra git commit: Better detection/logging for corruption in compressed sstables

2015-01-07 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk 49dea4193 -> ac27409e1 Better detection/logging for corruption in compressed sstables Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8192 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

cassandra git commit: Better detection/logging for corruption in compressed sstables

2015-01-07 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 2afe0e880 -> 905273e3e Better detection/logging for corruption in compressed sstables Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8192 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

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

2015-01-07 Thread jmckenzie
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/ac27409e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac27409e Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-12-16 Thread jmckenzie
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java src/java/org/apache/cassandra/db/compaction/CompactionIterable.java src/java/org/apache/cassandra/db/compaction/CompactionManager.java sr

[1/5] cassandra git commit: Fix ref counting race between SSTableScanner and SSTR

2014-12-16 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/trunk e73fccdcd -> 32ac6af2b Fix ref counting race between SSTableScanner and SSTR Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8399 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

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

2014-12-16 Thread jmckenzie
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bee53d72/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java index 2488

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

2014-12-16 Thread jmckenzie
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/32ac6af2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32ac6af2 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[1/2] cassandra git commit: Fix ref counting race between SSTableScanner and SSTR

2014-12-16 Thread jmckenzie
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 987191418 -> ffa806733 Fix ref counting race between SSTableScanner and SSTR Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8399 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-

[4/5] cassandra git commit: add missing file

2014-12-16 Thread jmckenzie
add missing file Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffa80673 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffa80673 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffa80673 Branc

[2/2] cassandra git commit: add missing file

2014-12-16 Thread jmckenzie
add missing file Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffa80673 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffa80673 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffa80673 Branc

<    5   6   7   8   9   10   11   12   >