[4/6] git commit: merge from 1.2

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

[jira] [Created] (CASSANDRA-6214) Make LOCAL_ONE the default consistency for cassandra.consistencylevel.[read|write]

Jeremy Hanna created CASSANDRA-6214: --- Summary: Make LOCAL_ONE the default consistency for cassandra.consistencylevel.[read|write] Key: CASSANDRA-6214 URL: https://issues.apache.org/jira/browse/CASSANDRA-6214

[jira] [Commented] (CASSANDRA-6210) Repair hangs when a new datacenter is added to a cluster

[ https://issues.apache.org/jira/browse/CASSANDRA-6210?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13798524#comment-13798524 ] Russell Alexander Spitzer commented on CASSANDRA-6210: -- The

[jira] [Updated] (CASSANDRA-4925) Failure Detector should log or ignore sudden time change to the past

[ https://issues.apache.org/jira/browse/CASSANDRA-4925?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] sankalp kohli updated CASSANDRA-4925: - Attachment: trunk-4925-v2.patch Another patch Failure Detector should log or

[jira] [Created] (CASSANDRA-6215) Possible space leak in datastax.driver.core

Donald Smith created CASSANDRA-6215: --- Summary: Possible space leak in datastax.driver.core Key: CASSANDRA-6215 URL: https://issues.apache.org/jira/browse/CASSANDRA-6215 Project: Cassandra

[jira] [Commented] (CASSANDRA-6048) Add the ability to use multiple indexes in a single query

[ https://issues.apache.org/jira/browse/CASSANDRA-6048?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13798659#comment-13798659 ] Alex Liu commented on CASSANDRA-6048: - From this link

[jira] [Created] (CASSANDRA-6216) Level Compaction should persist last compacted key per level

sankalp kohli created CASSANDRA-6216: Summary: Level Compaction should persist last compacted key per level Key: CASSANDRA-6216 URL: https://issues.apache.org/jira/browse/CASSANDRA-6216 Project:

[jira] [Commented] (CASSANDRA-6216) Level Compaction should persist last compacted key per level

[ https://issues.apache.org/jira/browse/CASSANDRA-6216?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13798675#comment-13798675 ] sankalp kohli commented on CASSANDRA-6216: -- Instead of sorting all sstables

git commit: fix bad merge

Updated Branches: refs/heads/cassandra-2.0 229da3725 - f19610c1a 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/f19610c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f19610c1 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/99c93158 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99c93158 Diff:

[1/2] git commit: fix bad merge

Updated Branches: refs/heads/trunk 78cad84ae - 99c93158d 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/f19610c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f19610c1 Diff:

[2/6] git commit: Rework node replacement. Patch by brandonwilliams, reviewed by Tyle Hobbs for CASSANDRA-5916

Rework node replacement. Patch by brandonwilliams, reviewed by Tyle Hobbs for CASSANDRA-5916 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/351d43ef Tree:

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

[1/6] git commit: Rework node replacement. Patch by brandonwilliams, reviewed by Tyle Hobbs for CASSANDRA-5916

Updated Branches: refs/heads/cassandra-1.2 c5368c70f - 351d43ef1 refs/heads/cassandra-2.0 f19610c1a - f08411954 refs/heads/trunk 99c93158d - 659296b92 Rework node replacement. Patch by brandonwilliams, reviewed by Tyle Hobbs for CASSANDRA-5916 Project:

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

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: NEWS.txt src/java/org/apache/cassandra/gms/Gossiper.java src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[3/6] git commit: Rework node replacement. Patch by brandonwilliams, reviewed by Tyle Hobbs for CASSANDRA-5916

Rework node replacement. Patch by brandonwilliams, reviewed by Tyle Hobbs for CASSANDRA-5916 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/351d43ef Tree:

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

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: NEWS.txt src/java/org/apache/cassandra/gms/Gossiper.java src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[jira] [Commented] (CASSANDRA-5571) Reject bootstrapping endpoints that are already in the ring with different gossip data

[ https://issues.apache.org/jira/browse/CASSANDRA-5571?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13798723#comment-13798723 ] Brandon Williams commented on CASSANDRA-5571: - With CASSANDRA-5916 done,

[jira] [Updated] (CASSANDRA-5916) gossip and tokenMetadata get hostId out of sync on failed replace_node with the same IP address

[ https://issues.apache.org/jira/browse/CASSANDRA-5916?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams updated CASSANDRA-5916: Fix Version/s: (was: 1.2.12) 1.2.11 gossip and

[jira] [Commented] (CASSANDRA-6215) Possible space leak in datastax.driver.core

[ https://issues.apache.org/jira/browse/CASSANDRA-6215?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13798733#comment-13798733 ] Alex Liu commented on CASSANDRA-6215: - This is not related to C* server, it's more

[jira] [Resolved] (CASSANDRA-6215) Possible space leak in datastax.driver.core

[ https://issues.apache.org/jira/browse/CASSANDRA-6215?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams resolved CASSANDRA-6215. - Resolution: Invalid If you feel this is a driver problem, you should open a

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

[1/6] git commit: update changes

Updated Branches: refs/heads/cassandra-1.2 351d43ef1 - acd4f8057 refs/heads/cassandra-2.0 f08411954 - cb585ef9e refs/heads/trunk 659296b92 - 8ec455d84 update changes Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

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

[3/6] git commit: update changes

update changes Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/acd4f805 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/acd4f805 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/acd4f805

[jira] [Commented] (CASSANDRA-3578) Multithreaded commitlog

[ https://issues.apache.org/jira/browse/CASSANDRA-3578?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13798746#comment-13798746 ] Vijay commented on CASSANDRA-3578: -- Pushed my changes to

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

[1/3] git commit: fix merge

Updated Branches: refs/heads/cassandra-2.0 cb585ef9e - 4dc5d690f refs/heads/trunk 8ec455d84 - a9d64ef86 fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4dc5d690 Tree:

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

<    1   2