[jira] [Resolved] (CASSANDRA-5751) Columns defined as datatype counter will become 'null' after deletion

[ https://issues.apache.org/jira/browse/CASSANDRA-5751?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain Lebresne resolved CASSANDRA-5751. - Resolution: Won't Fix Quoting http://wiki.apache.org/cassandra/Counters

git commit: Fix unit tests

Updated Branches: refs/heads/trunk 663bdfbd6 - 20c0baf08 Fix unit tests Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/20c0baf0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20c0baf0 Diff:

git commit: Fix potential index out of bound error in RangeTombstoneList (+test)

Updated Branches: refs/heads/cassandra-1.2 fa327aa69 - f5b224cf9 Fix potential index out of bound error in RangeTombstoneList (+test) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5b224cf Tree:

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

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

[1/2] git commit: Fix potential index out of bound error in RangeTombstoneList (+test)

Updated Branches: refs/heads/trunk 20c0baf08 - 4df6c2875 Fix potential index out of bound error in RangeTombstoneList (+test) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5b224cf Tree:

git commit: cqlsh: add missing table options to DESCRIBE output

Updated Branches: refs/heads/trunk 4df6c2875 - 62b90340d cqlsh: add missing table options to DESCRIBE output patch by Aleksey Yeschenko; reviewed by Brandon Williams for CASSANDRA-5749 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[jira] [Created] (CASSANDRA-5761) Issue with secondary index sstable.

Andriy Yevsyukov created CASSANDRA-5761: --- Summary: Issue with secondary index sstable. Key: CASSANDRA-5761 URL: https://issues.apache.org/jira/browse/CASSANDRA-5761 Project: Cassandra

[jira] [Updated] (CASSANDRA-5761) Issue with secondary index sstable.

[ https://issues.apache.org/jira/browse/CASSANDRA-5761?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Andriy Yevsyukov updated CASSANDRA-5761: Priority: Critical (was: Major) Issue with secondary index sstable.

[jira] [Commented] (CASSANDRA-5748) When flushing, nodes spent almost 100% in AbstractCompositeType.compare

[ https://issues.apache.org/jira/browse/CASSANDRA-5748?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13708444#comment-13708444 ] Chris Eineke commented on CASSANDRA-5748: - Sylvain, Thank you for your

[jira] [Created] (CASSANDRA-5762) Lost row marker after TTL expires

Taner Catakli created CASSANDRA-5762: Summary: Lost row marker after TTL expires Key: CASSANDRA-5762 URL: https://issues.apache.org/jira/browse/CASSANDRA-5762 Project: Cassandra Issue

[jira] [Assigned] (CASSANDRA-5757) assertionError in repair

[ https://issues.apache.org/jira/browse/CASSANDRA-5757?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain Lebresne reassigned CASSANDRA-5757: --- Assignee: Sylvain Lebresne assertionError in repair

[jira] [Assigned] (CASSANDRA-5762) Lost row marker after TTL expires

[ https://issues.apache.org/jira/browse/CASSANDRA-5762?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain Lebresne reassigned CASSANDRA-5762: --- Assignee: Sylvain Lebresne Lost row marker after TTL expires

[jira] [Commented] (CASSANDRA-5762) Lost row marker after TTL expires

[ https://issues.apache.org/jira/browse/CASSANDRA-5762?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13708490#comment-13708490 ] Sylvain Lebresne commented on CASSANDRA-5762: - This is a rather annoying

[jira] [Commented] (CASSANDRA-5760) cqlsh DESCRIBE should properly describe CUSTOM secondary indexes

[ https://issues.apache.org/jira/browse/CASSANDRA-5760?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13708544#comment-13708544 ] Jonathan Ellis commented on CASSANDRA-5760: --- +1 cqlsh

git commit: cqlsh: handle CUSTOM 2i in DESCRIBE output

Updated Branches: refs/heads/cassandra-1.2 f5b224cf9 - f79a2d3a6 cqlsh: handle CUSTOM 2i in DESCRIBE output patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-5760 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

Merge branch 'cassandra-1.2' into trunk Conflicts: bin/cqlsh Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3828cc51 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3828cc51 Diff:

[1/2] git commit: cqlsh: handle CUSTOM 2i in DESCRIBE output

Updated Branches: refs/heads/trunk 62b90340d - 3828cc519 cqlsh: handle CUSTOM 2i in DESCRIBE output patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-5760 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[jira] [Created] (CASSANDRA-5763) CqlPagingRecordReader should quote table and column identifiers

Piotr Kołaczkowski created CASSANDRA-5763: - Summary: CqlPagingRecordReader should quote table and column identifiers Key: CASSANDRA-5763 URL: https://issues.apache.org/jira/browse/CASSANDRA-5763

[jira] [Updated] (CASSANDRA-5701) Apache.Cassandra.Cassandra.get_count will disconnect but not throw InvalidRequestException when column family is not exist.

[ https://issues.apache.org/jira/browse/CASSANDRA-5701?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams updated CASSANDRA-5701: Labels: (was: patch) Apache.Cassandra.Cassandra.get_count will

git commit: Kill the remains of old cf ids in CFMetaData

Updated Branches: refs/heads/trunk 3828cc519 - 40cf7b00f Kill the remains of old cf ids in CFMetaData Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40cf7b00 Tree:

[jira] [Updated] (CASSANDRA-5763) CqlPagingRecordReader should quote table and column identifiers

[ https://issues.apache.org/jira/browse/CASSANDRA-5763?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Piotr Kołaczkowski updated CASSANDRA-5763: -- Attachment: 0001-DSP-2292-CPIF-quotes-table-and-column-names-in-gener.patch

[jira] [Commented] (CASSANDRA-5763) CqlPagingRecordReader should quote table and column identifiers

[ https://issues.apache.org/jira/browse/CASSANDRA-5763?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13708615#comment-13708615 ] Piotr Kołaczkowski commented on CASSANDRA-5763: --- Related DSE issue:

[jira] [Updated] (CASSANDRA-5762) Lost row marker after TTL expires

[ https://issues.apache.org/jira/browse/CASSANDRA-5762?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain Lebresne updated CASSANDRA-5762: Affects Version/s: (was: 1.2.6) 1.2.0 Lost row

[jira] [Updated] (CASSANDRA-5757) assertionError in repair

[ https://issues.apache.org/jira/browse/CASSANDRA-5757?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain Lebresne updated CASSANDRA-5757: Attachment: 5757.txt The actual AssertionError is due to basically a misplaced

[jira] [Commented] (CASSANDRA-5727) Evaluate default LCS sstable size

[ https://issues.apache.org/jira/browse/CASSANDRA-5727?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13708658#comment-13708658 ] Robert Coli commented on CASSANDRA-5727: Anecdotally, many people on

[jira] [Updated] (CASSANDRA-5763) CqlPagingRecordReader should quote table and column identifiers

[ https://issues.apache.org/jira/browse/CASSANDRA-5763?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Piotr Kołaczkowski updated CASSANDRA-5763: -- Attachment: (was:

[jira] [Updated] (CASSANDRA-5763) CqlPagingRecordReader should quote table and column identifiers

[ https://issues.apache.org/jira/browse/CASSANDRA-5763?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Piotr Kołaczkowski updated CASSANDRA-5763: -- Attachment: DSP-2292.patch CqlPagingRecordReader should quote table

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

[ https://issues.apache.org/jira/browse/CASSANDRA-5337?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jason Brown updated CASSANDRA-5337: --- Reviewer: jasobrown (was: vijay2...@yahoo.com) vnode-aware replacenode command

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

[ https://issues.apache.org/jira/browse/CASSANDRA-5337?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13708800#comment-13708800 ] Jason Brown commented on CASSANDRA-5337: lgtm. The only (very minor)

[jira] [Assigned] (CASSANDRA-5689) NPE shutting down Cassandra trunk (cassandra-1.2.5-989-g70dfb70)

[ https://issues.apache.org/jira/browse/CASSANDRA-5689?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Cathy Daw reassigned CASSANDRA-5689: Assignee: Cathy Daw (was: Alex Zarutin) NPE shutting down Cassandra trunk

[jira] [Assigned] (CASSANDRA-5695) Convert pig smoke tests into real PigUnit tests

[ https://issues.apache.org/jira/browse/CASSANDRA-5695?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Cathy Daw reassigned CASSANDRA-5695: Assignee: Alex Zarutin (was: Ryan McGuire) Convert pig smoke tests into real

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

[ https://issues.apache.org/jira/browse/CASSANDRA-5337?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams updated CASSANDRA-5337: Attachment: 5337-v2.txt Good idea, v2 incorporates it and adds a minor

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

[ https://issues.apache.org/jira/browse/CASSANDRA-5337?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13708959#comment-13708959 ] Jason Brown commented on CASSANDRA-5337: v2 lgtm.

[2/3] git commit: Add replace_token functionality for vnodes. Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5337

Add replace_token functionality for vnodes. Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5337 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba6396a2 Tree:

[1/3] git commit: Add replace_token functionality for vnodes. Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5337

Updated Branches: refs/heads/cassandra-1.2 f79a2d3a6 - ba6396a20 refs/heads/trunk 40cf7b00f - 280284961 Add replace_token functionality for vnodes. Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5337 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/28028496 Tree:

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

[ https://issues.apache.org/jira/browse/CASSANDRA-5337?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams updated CASSANDRA-5337: Tester: enigmacurry vnode-aware replacenode command

[2/3] git commit: fix build

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

[1/3] git commit: fix build

Updated Branches: refs/heads/cassandra-1.2 ba6396a20 - d6145668c refs/heads/trunk 280284961 - 11928f7d8 fix build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6145668 Tree:

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

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

[2/3] git commit: invert replace condition

invert replace condition Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7061901 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7061901 Diff:

[1/3] git commit: invert replace condition

Updated Branches: refs/heads/cassandra-1.2 d6145668c - e7061901a refs/heads/trunk 11928f7d8 - ae26aab47 invert replace condition Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7061901 Tree:

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

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

[jira] [Commented] (CASSANDRA-5727) Evaluate default LCS sstable size

[ https://issues.apache.org/jira/browse/CASSANDRA-5727?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13709054#comment-13709054 ] Radim Kolar commented on CASSANDRA-5727: Leveldb is using 2MB by default. Real

[jira] [Commented] (CASSANDRA-5727) Evaluate default LCS sstable size

[ https://issues.apache.org/jira/browse/CASSANDRA-5727?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13709056#comment-13709056 ] Jonathan Ellis commented on CASSANDRA-5727: --- Have you read the leveldb

[jira] [Comment Edited] (CASSANDRA-5727) Evaluate default LCS sstable size

[ https://issues.apache.org/jira/browse/CASSANDRA-5727?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13709056#comment-13709056 ] Jonathan Ellis edited comment on CASSANDRA-5727 at 7/15/13 10:19 PM:

[jira] [Comment Edited] (CASSANDRA-5727) Evaluate default LCS sstable size

[ https://issues.apache.org/jira/browse/CASSANDRA-5727?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13709056#comment-13709056 ] Jonathan Ellis edited comment on CASSANDRA-5727 at 7/15/13 10:21 PM:

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

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

[2/3] git commit: quote identifiers in CqlPagingRecordReader patch by Piotr Kołaczkowski; reviewed by jbellis for CASSANDRA-5763

quote identifiers in CqlPagingRecordReader patch by Piotr Kołaczkowski; reviewed by jbellis for CASSANDRA-5763 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66599611 Tree:

[1/3] git commit: quote identifiers in CqlPagingRecordReader patch by Piotr Kołaczkowski; reviewed by jbellis for CASSANDRA-5763

Updated Branches: refs/heads/cassandra-1.2 e7061901a - 66599611d refs/heads/trunk ae26aab47 - 3f8790769 quote identifiers in CqlPagingRecordReader patch by Piotr Kołaczkowski; reviewed by jbellis for CASSANDRA-5763 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[jira] [Commented] (CASSANDRA-5763) CqlPagingRecordReader should quote table and column identifiers

[ https://issues.apache.org/jira/browse/CASSANDRA-5763?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13709082#comment-13709082 ] Jonathan Ellis commented on CASSANDRA-5763: --- LGTM. Rebased for you and

[2/3] git commit: replace string concatenation with modern logging and String.format

replace string concatenation with modern logging and String.format Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2daab71 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2daab71 Diff:

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

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

[1/3] git commit: replace string concatenation with modern logging and String.format

Updated Branches: refs/heads/cassandra-1.2 66599611d - b2daab711 refs/heads/trunk 3f8790769 - e4ebd5ff5 replace string concatenation with modern logging and String.format Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[jira] [Commented] (CASSANDRA-4983) Improve range wrap-around in CFIF: CFIF shouldn't produce input splits of very tiny size

[ https://issues.apache.org/jira/browse/CASSANDRA-4983?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13709111#comment-13709111 ] Jonathan Ellis commented on CASSANDRA-4983: --- I'm not really a fan of making

[jira] [Commented] (CASSANDRA-5718) Cql3 reader returns duplicate rows if the cluster column is reversed

[ https://issues.apache.org/jira/browse/CASSANDRA-5718?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13709123#comment-13709123 ] Alex Liu commented on CASSANDRA-5718: - create a compact table {code} CREATE

[jira] [Comment Edited] (CASSANDRA-5718) Cql3 reader returns duplicate rows if the cluster column is reversed

[ https://issues.apache.org/jira/browse/CASSANDRA-5718?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13709123#comment-13709123 ] Alex Liu edited comment on CASSANDRA-5718 at 7/15/13 11:03 PM:

[jira] [Comment Edited] (CASSANDRA-5718) Cql3 reader returns duplicate rows if the cluster column is reversed

[ https://issues.apache.org/jira/browse/CASSANDRA-5718?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13709123#comment-13709123 ] Alex Liu edited comment on CASSANDRA-5718 at 7/15/13 11:03 PM:

[jira] [Commented] (CASSANDRA-4686) update hadoop version in wordcount exampe

[ https://issues.apache.org/jira/browse/CASSANDRA-4686?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13709132#comment-13709132 ] Alex Liu commented on CASSANDRA-4686: - +1 update hadoop version

[jira] [Updated] (CASSANDRA-5542) BulkLoader is broken in trunk

[ https://issues.apache.org/jira/browse/CASSANDRA-5542?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Yuki Morishita updated CASSANDRA-5542: -- Attachment: (was: 0002-make-BulkLoader-work-with-SSTableReader.patch)

[jira] [Updated] (CASSANDRA-5542) BulkLoader is broken in trunk

[ https://issues.apache.org/jira/browse/CASSANDRA-5542?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Yuki Morishita updated CASSANDRA-5542: -- Attachment: (was: 0001-change-streaming-procedure.patch) BulkLoader is

[jira] [Updated] (CASSANDRA-5542) BulkLoader is broken in trunk

[ https://issues.apache.org/jira/browse/CASSANDRA-5542?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Yuki Morishita updated CASSANDRA-5542: -- Attachment: 0001-change-streaming-procedure.patch

[jira] [Created] (CASSANDRA-5764) CommitLogReplayer should calculate checksums differently for 2.0

Dave Brosius created CASSANDRA-5764: --- Summary: CommitLogReplayer should calculate checksums differently for 2.0 Key: CASSANDRA-5764 URL: https://issues.apache.org/jira/browse/CASSANDRA-5764

[jira] [Updated] (CASSANDRA-5764) CommitLogReplayer should calculate checksums differently for 2.0

[ https://issues.apache.org/jira/browse/CASSANDRA-5764?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Dave Brosius updated CASSANDRA-5764: Attachment: 5764.txt CommitLogReplayer should calculate checksums differently for

[2/3] git commit: another inverted condition

another inverted condition Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3280fb08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3280fb08 Diff:

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

Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eec01e9f Tree:

[1/3] git commit: another inverted condition

Updated Branches: refs/heads/cassandra-1.2 b2daab711 - 3280fb087 refs/heads/trunk e4ebd5ff5 - eec01e9fe another inverted condition Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3280fb08 Tree: