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

2013-08-22 Thread dbrosius
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/ed79c143 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed79c143 Diff: http://git-wip-us.apache.org/repos/a

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

2013-08-22 Thread dbrosius
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/239e2d71 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/239e2d71 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-08-22 Thread dbrosius
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af9c7074 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af9c7074 Diff: http://git-wip-us.apache.org/repos/a

[1/4] git commit: fix nodetool getendpoints when the key has a space in it patch by gdeangelis reviewed by dbrosius for CASSANDRA-4551

2013-08-22 Thread dbrosius
Updated Branches: refs/heads/trunk 3f5322f02 -> 239e2d717 fix nodetool getendpoints when the key has a space in it patch by gdeangelis reviewed by dbrosius for CASSANDRA-4551 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandr

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

2013-08-22 Thread dbrosius
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af9c7074 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af9c7074 Diff: http://git-wip-us.apache.org/repos/a

[1/3] git commit: fix nodetool getendpoints when the key has a space in it patch by gdeangelis reviewed by dbrosius for CASSANDRA-4551

2013-08-22 Thread dbrosius
Updated Branches: refs/heads/cassandra-2.0 05929c05c -> ed79c1439 fix nodetool getendpoints when the key has a space in it patch by gdeangelis reviewed by dbrosius for CASSANDRA-4551 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.0.0' into cassandra-2.0

2013-08-22 Thread dbrosius
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/ed79c143 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed79c143 Diff: http://git-wip-us.apache.org/repos/a

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

2013-08-22 Thread dbrosius
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af9c7074 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af9c7074 Diff: http://git-wip-us.apache.org/repos/a

[1/2] git commit: fix nodetool getendpoints when the key has a space in it patch by gdeangelis reviewed by dbrosius for CASSANDRA-4551

2013-08-22 Thread dbrosius
Updated Branches: refs/heads/cassandra-2.0.0 624a7a02f -> af9c7074f fix nodetool getendpoints when the key has a space in it patch by gdeangelis reviewed by dbrosius for CASSANDRA-4551 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/as

git commit: fix nodetool getendpoints when the key has a space in it patch by gdeangelis reviewed by dbrosius for CASSANDRA-4551

2013-08-22 Thread dbrosius
Updated Branches: refs/heads/cassandra-1.2 39066b722 -> ddb501df4 fix nodetool getendpoints when the key has a space in it patch by gdeangelis reviewed by dbrosius for CASSANDRA-4551 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/

[jira] [Commented] (CASSANDRA-5337) vnode-aware replacenode command

2013-08-22 Thread Brandon Williams (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5337?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13748170#comment-13748170 ] Brandon Williams commented on CASSANDRA-5337: - Those were fixed post-commi

[jira] [Created] (CASSANDRA-5925) Race condition in update lightweight transaction

2013-08-22 Thread Phil Persad (JIRA)
Phil Persad created CASSANDRA-5925: -- Summary: Race condition in update lightweight transaction Key: CASSANDRA-5925 URL: https://issues.apache.org/jira/browse/CASSANDRA-5925 Project: Cassandra

[jira] [Commented] (CASSANDRA-5337) vnode-aware replacenode command

2013-08-22 Thread Mike Heffner (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5337?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13748022#comment-13748022 ] Mike Heffner commented on CASSANDRA-5337: - Is it correct that these two condit

[jira] [Created] (CASSANDRA-5924) If migration (upgrade) failed mid-way, some data will be "lost" on the upgraded instance

2013-08-22 Thread Jackson Chung (JIRA)
Jackson Chung created CASSANDRA-5924: Summary: If migration (upgrade) failed mid-way, some data will be "lost" on the upgraded instance Key: CASSANDRA-5924 URL: https://issues.apache.org/jira/browse/CASSANDRA-

[jira] [Updated] (CASSANDRA-5923) Upgrade Apache Thrift to 0.9.1

2013-08-22 Thread Jake Farrell (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5923?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jake Farrell updated CASSANDRA-5923: Attachment: cassandra-5923.patch > Upgrade Apache Thrift to 0.9.1 > ---

[jira] [Created] (CASSANDRA-5923) Upgrade Apache Thrift to 0.9.1

2013-08-22 Thread Jake Farrell (JIRA)
Jake Farrell created CASSANDRA-5923: --- Summary: Upgrade Apache Thrift to 0.9.1 Key: CASSANDRA-5923 URL: https://issues.apache.org/jira/browse/CASSANDRA-5923 Project: Cassandra Issue Type: Im

[jira] [Commented] (CASSANDRA-5867) The Pig CqlStorage/AbstractCassandraStorage classes don't handle collection types

2013-08-22 Thread Alex Liu (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5867?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747880#comment-13747880 ] Alex Liu commented on CASSANDRA-5867: - The following is the data which will be aut

[jira] [Commented] (CASSANDRA-5078) save compaction merge counts in a system table

2013-08-22 Thread lantao yan (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5078?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747861#comment-13747861 ] lantao yan commented on CASSANDRA-5078: --- thanks for all the details. I will upda

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

2013-08-22 Thread Brandon Williams (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5916?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747853#comment-13747853 ] Brandon Williams edited comment on CASSANDRA-5916 at 8/22/13 8:22 PM: --

[jira] [Commented] (CASSANDRA-5916) gossip and tokenMetadata get hostId out of sync on failed replace_node

2013-08-22 Thread Brandon Williams (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5916?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747853#comment-13747853 ] Brandon Williams commented on CASSANDRA-5916: - This isn't so much a proble

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

2013-08-22 Thread Brandon Williams (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5916?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams updated CASSANDRA-5916: Summary: gossip and tokenMetadata get hostId out of sync on failed replace_node

[jira] [Commented] (CASSANDRA-5915) node flapping prevents replace_node from succeeding consistently

2013-08-22 Thread Brandon Williams (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5915?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747852#comment-13747852 ] Brandon Williams commented on CASSANDRA-5915: - Ok, the same UUID does make

[jira] [Commented] (CASSANDRA-5867) The Pig CqlStorage/AbstractCassandraStorage classes don't handle collection types

2013-08-22 Thread Alex Holmansky (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5867?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747849#comment-13747849 ] Alex Holmansky commented on CASSANDRA-5867: --- If the key of C* map is convert

[jira] [Commented] (CASSANDRA-5918) Remove CQL2 entirely from Cassandra 2.2

2013-08-22 Thread Robert Coli (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5918?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747847#comment-13747847 ] Robert Coli commented on CASSANDRA-5918: FWIW, this sounds like a reasonable i

[jira] [Commented] (CASSANDRA-5078) save compaction merge counts in a system table

2013-08-22 Thread Jonathan Ellis (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5078?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747803#comment-13747803 ] Jonathan Ellis commented on CASSANDRA-5078: --- bq. Use CompositeData Yuki sug

[jira] [Updated] (CASSANDRA-5911) Commit logs are not removed after nodetool flush or nodetool drain

2013-08-22 Thread Jonathan Ellis (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5911?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Ellis updated CASSANDRA-5911: -- Reviewer: jbellis Fix Version/s: 2.0.1 > Commit logs are not removed a

[jira] [Assigned] (CASSANDRA-5911) Commit logs are not removed after nodetool flush or nodetool drain

2013-08-22 Thread Jonathan Ellis (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5911?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Ellis reassigned CASSANDRA-5911: - Assignee: Vijay > Commit logs are not removed after nodetool flush or nod

[jira] [Commented] (CASSANDRA-5078) save compaction merge counts in a system table

2013-08-22 Thread Jonathan Ellis (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5078?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747780#comment-13747780 ] Jonathan Ellis commented on CASSANDRA-5078: --- We should probably exclude comp

[jira] [Commented] (CASSANDRA-4551) Nodetool getendpoints keys do not work with spaces, key_validation=ascii value of key => "a test" no delimiter

2013-08-22 Thread Greg DeAngelis (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-4551?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747718#comment-13747718 ] Greg DeAngelis commented on CASSANDRA-4551: --- I did not see the same issue wi

[jira] [Updated] (CASSANDRA-5922) Delete doesn't delete data.

2013-08-22 Thread Chris Eineke (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5922?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Chris Eineke updated CASSANDRA-5922: Description: In a nutshell, I'm running several test cases against my Cassandra JPA im

[jira] [Commented] (CASSANDRA-5922) Delete doesn't delete data.

2013-08-22 Thread Sylvain Lebresne (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5922?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747687#comment-13747687 ] Sylvain Lebresne commented on CASSANDRA-5922: - A simple script that helps

[jira] [Created] (CASSANDRA-5922) Delete doesn't delete data.

2013-08-22 Thread Chris Eineke (JIRA)
Chris Eineke created CASSANDRA-5922: --- Summary: Delete doesn't delete data. Key: CASSANDRA-5922 URL: https://issues.apache.org/jira/browse/CASSANDRA-5922 Project: Cassandra Issue Type: Bug

[jira] [Comment Edited] (CASSANDRA-5078) save compaction merge counts in a system table

2013-08-22 Thread lantao yan (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5078?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747659#comment-13747659 ] lantao yan edited comment on CASSANDRA-5078 at 8/22/13 5:02 PM:

[jira] [Commented] (CASSANDRA-5078) save compaction merge counts in a system table

2013-08-22 Thread lantao yan (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5078?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747659#comment-13747659 ] lantao yan commented on CASSANDRA-5078: --- @Jonathan Ellis, do we save the compact

[jira] [Commented] (CASSANDRA-5918) Remove CQL2 entirely from Cassandra 2.2

2013-08-22 Thread Patrick McFadin (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5918?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747648#comment-13747648 ] Patrick McFadin commented on CASSANDRA-5918: Your concern for my happiness

[jira] [Commented] (CASSANDRA-5918) Remove CQL2 entirely from Cassandra 2.2

2013-08-22 Thread Jonathan Ellis (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5918?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747627#comment-13747627 ] Jonathan Ellis commented on CASSANDRA-5918: --- If it takes calling it 3.0 to m

[jira] [Commented] (CASSANDRA-5918) Remove CQL2 entirely from Cassandra 2.2

2013-08-22 Thread Brandon Williams (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5918?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747619#comment-13747619 ] Brandon Williams commented on CASSANDRA-5918: - That's basically what 2.2 i

[jira] [Commented] (CASSANDRA-5918) Remove CQL2 entirely from Cassandra 2.2

2013-08-22 Thread Patrick McFadin (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5918?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747615#comment-13747615 ] Patrick McFadin commented on CASSANDRA-5918: If we are going to remove it

[jira] [Updated] (CASSANDRA-4191) Add `nodetool cfstats ` abilities

2013-08-22 Thread Jonathan Ellis (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-4191?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Ellis updated CASSANDRA-4191: -- Reviewer: dbrosius (was: brandon.williams) Assignee: Lyuben Todorov (was: Dave

[jira] [Commented] (CASSANDRA-4191) Add `nodetool cfstats ` abilities

2013-08-22 Thread Hayato Shimizu (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-4191?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747578#comment-13747578 ] Hayato Shimizu commented on CASSANDRA-4191: --- What's the status of this issue

[jira] [Commented] (CASSANDRA-5921) Don't return empty list when the L0 compaction candidates could cause overlap in L1

2013-08-22 Thread Jonathan Ellis (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5921?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747570#comment-13747570 ] Jonathan Ellis commented on CASSANDRA-5921: --- - You changed {{compactingL0}}

[Cassandra Wiki] Update of "ClientOptions" by JonathanEllis

2013-08-22 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Cassandra Wiki" for change notification. The "ClientOptions" page has been changed by JonathanEllis: https://wiki.apache.org/cassandra/ClientOptions?action=diff&rev1=177&rev2=178 Comment: add node-cassandra-cql * [[htt

[jira] [Created] (CASSANDRA-5921) Don't return empty list when the L0 compaction candidates could cause overlap in L1

2013-08-22 Thread Marcus Eriksson (JIRA)
Marcus Eriksson created CASSANDRA-5921: -- Summary: Don't return empty list when the L0 compaction candidates could cause overlap in L1 Key: CASSANDRA-5921 URL: https://issues.apache.org/jira/browse/CASSANDRA-5

[jira] [Updated] (CASSANDRA-5921) Don't return empty list when the L0 compaction candidates could cause overlap in L1

2013-08-22 Thread Marcus Eriksson (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5921?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Marcus Eriksson updated CASSANDRA-5921: --- Attachment: 0001-instead-of-doing-no-compaction-if-we-have-sstables-t.patch >

[jira] [Issue Comment Deleted] (CASSANDRA-5078) save compaction merge counts in a system table

2013-08-22 Thread lantao yan (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5078?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] lantao yan updated CASSANDRA-5078: -- Comment: was deleted (was: is it because of the CompactionManager compacting compaction_his

git commit: fix build - log4j is gone

2013-08-22 Thread marcuse
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 Diff

[jira] [Updated] (CASSANDRA-5920) Allow secondary indexed columns to be used with IN operator

2013-08-22 Thread David Semeria (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5920?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] David Semeria updated CASSANDRA-5920: - Description: Related to https://issues.apache.org/jira/browse/CASSANDRA-4709 Using a

[jira] [Updated] (CASSANDRA-5920) Allow secondary indexed columns to be used with IN operator

2013-08-22 Thread David Semeria (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5920?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] David Semeria updated CASSANDRA-5920: - Description: Related to https://issues.apache.org/jira/browse/CASSANDRA-4709 Using a

[jira] [Updated] (CASSANDRA-5920) Allow secondary indexed columns to be used with IN operator

2013-08-22 Thread David Semeria (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5920?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] David Semeria updated CASSANDRA-5920: - Description: Related to https://issues.apache.org/jira/browse/CASSANDRA-4709 Current

[jira] [Created] (CASSANDRA-5920) Allow secondary indexed columns to be used with IN operator

2013-08-22 Thread David Semeria (JIRA)
David Semeria created CASSANDRA-5920: Summary: Allow secondary indexed columns to be used with IN operator Key: CASSANDRA-5920 URL: https://issues.apache.org/jira/browse/CASSANDRA-5920 Project: Ca

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

2013-08-22 Thread slebresne
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/8bc0f599 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bc0f599 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[1/5] git commit: Fix changelog

2013-08-22 Thread slebresne
Updated Branches: refs/heads/trunk d24e90009 -> 8bc0f5990 Fix changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da55d76d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da55d76d Diff: http://git

[1/3] git commit: Add SSTableSplitter tool to split sstables offline

2013-08-22 Thread slebresne
Updated Branches: refs/heads/cassandra-2.0 da55d76d2 -> 05929c05c Add SSTableSplitter tool to split sstables offline patch by slebresne; reviewed by krummas for CASSANDRA-4766 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassan

[2/5] git commit: Add SSTableSplitter tool to split sstables offline

2013-08-22 Thread slebresne
Add SSTableSplitter tool to split sstables offline patch by slebresne; reviewed by krummas for CASSANDRA-4766 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39066b72 Tree: http://git-wip-us.apache.org/repos/asf/cassa

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

2013-08-22 Thread slebresne
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionTask.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/624a7a02 Tree: http://git-wip-us.apa

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

2013-08-22 Thread slebresne
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionTask.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/624a7a02 Tree: http://git-wip-us.apa

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

2013-08-22 Thread slebresne
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/05929c05 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05929c05 Diff: http://git-wip-us.apache.org/repos/a

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

2013-08-22 Thread slebresne
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/05929c05 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05929c05 Diff: http://git-wip-us.apache.org/repos/a

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

2013-08-22 Thread slebresne
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionTask.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/624a7a02 Tree: http://git-wip-us.apa

[1/2] git commit: Add SSTableSplitter tool to split sstables offline

2013-08-22 Thread slebresne
Updated Branches: refs/heads/cassandra-2.0.0 5774ecb40 -> 624a7a02f Add SSTableSplitter tool to split sstables offline patch by slebresne; reviewed by krummas for CASSANDRA-4766 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cass

[jira] [Resolved] (CASSANDRA-4766) ReverseCompaction

2013-08-22 Thread Sylvain Lebresne (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-4766?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain Lebresne resolved CASSANDRA-4766. - Resolution: Fixed Alright, committed then, thanks > ReverseC

git commit: Add SSTableSplitter tool to split sstables offline

2013-08-22 Thread slebresne
Updated Branches: refs/heads/cassandra-1.2 9bb4d93e3 -> 39066b722 Add SSTableSplitter tool to split sstables offline patch by slebresne; reviewed by krummas for CASSANDRA-4766 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassan

[jira] [Commented] (CASSANDRA-5799) Column can expire while lazy compacting it...

2013-08-22 Thread Sylvain Lebresne (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5799?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747345#comment-13747345 ] Sylvain Lebresne commented on CASSANDRA-5799: - bq. Does it matter that my

git commit: Fix changelog

2013-08-22 Thread slebresne
Updated Branches: refs/heads/cassandra-2.0 f8be23a81 -> da55d76d2 Fix changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da55d76d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da55d76d Diff: ht

[1/3] git commit: reduce Map allocations in hinted handoff delivery patch by dbrosius reviewed by jbellis for cassandra-5919

2013-08-22 Thread slebresne
Updated Branches: refs/heads/trunk d60ead8ee -> d24e90009 reduce Map allocations in hinted handoff delivery patch by dbrosius reviewed by jbellis for cassandra-5919 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6

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

2013-08-22 Thread slebresne
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/d24e9000 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d24e9000 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[jira] [Commented] (CASSANDRA-5708) Add DELETE ... IF EXISTS to CQL3

2013-08-22 Thread Sylvain Lebresne (JIRA)
[ https://issues.apache.org/jira/browse/CASSANDRA-5708?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13747327#comment-13747327 ] Sylvain Lebresne commented on CASSANDRA-5708: - Right, we can't fully rely