Merge remote-tracking branch 'origin/cassandra-2.1' 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/05541ebc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05541ebc
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 a490d7efa - 05541ebca
refs/heads/trunk 3acba5bba - f10de1863
Include correct consistencyLevel in LWT timeout
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6884
Project:
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1059828
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1059828
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1059828
Merge remote-tracking branch 'origin/cassandra-2.1' 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/05541ebc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05541ebc
Diff:
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1059828
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1059828
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1059828
Include correct consistencyLevel in LWT timeout
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6884
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5e1cbca
Tree:
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/f10de186
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f10de186
Diff:
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/fd42aa3c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd42aa3c
Diff:
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7a3282d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7a3282d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7a3282d
Omit tombstones from schema digests
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6862
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ce44df4
Tree:
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7a3282d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7a3282d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7a3282d
Omit tombstones from schema digests
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6862
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ce44df4
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 f5e1cbca8 - 4ce44df4d
refs/heads/cassandra-2.1 05541ebca - a7a3282da
refs/heads/trunk f10de1863 - fd42aa3cf
Omit tombstones from schema digests
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6862
Project:
[
https://issues.apache.org/jira/browse/CASSANDRA-6862?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940217#comment-13940217
]
Jonathan Ellis commented on CASSANDRA-6862:
---
committed, will follow up in
[
https://issues.apache.org/jira/browse/CASSANDRA-6863?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940219#comment-13940219
]
Jonathan Ellis commented on CASSANDRA-6863:
---
Agreed.
Incorrect read repair
[
https://issues.apache.org/jira/browse/CASSANDRA-6689?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940231#comment-13940231
]
Pavel Yaskevich commented on CASSANDRA-6689:
[~jbellis] I am, sorry, I got
[
https://issues.apache.org/jira/browse/CASSANDRA-6822?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940287#comment-13940287
]
Duncan Sands commented on CASSANDRA-6822:
-
$ grep
[
https://issues.apache.org/jira/browse/CASSANDRA-6311?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940292#comment-13940292
]
Piotr Kołaczkowski commented on CASSANDRA-6311:
---
+1
Add
[
https://issues.apache.org/jira/browse/CASSANDRA-6816?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940293#comment-13940293
]
Sylvain Lebresne commented on CASSANDRA-6816:
-
+1, though we could maybe
[
https://issues.apache.org/jira/browse/CASSANDRA-6826?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940294#comment-13940294
]
Sylvain Lebresne commented on CASSANDRA-6826:
-
If you can reproduce easily
Duncan Sands created CASSANDRA-6887:
---
Summary: LOCAL_ONE read repair only does local repair, in spite of
global digest queries
Key: CASSANDRA-6887
URL: https://issues.apache.org/jira/browse/CASSANDRA-6887
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 4ce44df4d - f1f8384a0
Static columns with IF NOT EXISTS don't always work as expected
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6783
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e23e57ff
Repository: cassandra
Updated Branches:
refs/heads/trunk fd42aa3cf - fcd791ae7
Static columns with IF NOT EXISTS don't always work as expected
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6783
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 a7a3282da - e23e57fff
Static columns with IF NOT EXISTS don't always work as expected
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6783
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e23e57ff
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/fcd791ae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcd791ae
Diff:
[
https://issues.apache.org/jira/browse/CASSANDRA-6886?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940361#comment-13940361
]
Benedict commented on CASSANDRA-6886:
-
bq. Well, JMeter can be used in non-GUI
[
https://issues.apache.org/jira/browse/CASSANDRA-6783?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Sylvain Lebresne updated CASSANDRA-6783:
Attachment: (was: 6783-2.txt)
Collections should have a proper compare()
[
https://issues.apache.org/jira/browse/CASSANDRA-6783?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Sylvain Lebresne updated CASSANDRA-6783:
Attachment: 6783-2.txt
Can't seem to get this one right, can I? Updated v2 to
[
https://issues.apache.org/jira/browse/CASSANDRA-6311?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940367#comment-13940367
]
Sylvain Lebresne commented on CASSANDRA-6311:
-
Tried to commit this but v9
[
https://issues.apache.org/jira/browse/CASSANDRA-6837?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940383#comment-13940383
]
Sylvain Lebresne commented on CASSANDRA-6837:
-
At the risk of sounding
[
https://issues.apache.org/jira/browse/CASSANDRA-6883?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940392#comment-13940392
]
Benedict commented on CASSANDRA-6883:
-
Yes: Looks like I was using inclusive
[
https://issues.apache.org/jira/browse/CASSANDRA-6883?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Benedict updated CASSANDRA-6883:
Attachment: 6883.txt
stress read fails with IOException Data returned was not validated
[
https://issues.apache.org/jira/browse/CASSANDRA-6870?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940425#comment-13940425
]
Edward Capriolo commented on CASSANDRA-6870:
I am going to add one more
[
https://issues.apache.org/jira/browse/CASSANDRA-6837?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940435#comment-13940435
]
Jonathan Ellis commented on CASSANDRA-6837:
---
fair enough
Batch CAS does
[
https://issues.apache.org/jira/browse/CASSANDRA-6733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940437#comment-13940437
]
Nicolas Lalevée commented on CASSANDRA-6733:
I tried again the upgrade but
[
https://issues.apache.org/jira/browse/CASSANDRA-6781?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940459#comment-13940459
]
Marcus Eriksson commented on CASSANDRA-6781:
this looks good to me,
[
https://issues.apache.org/jira/browse/CASSANDRA-6781?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940475#comment-13940475
]
Benedict commented on CASSANDRA-6781:
-
+1. Changes look good.
I should really
Extend limits.conf in debian packaging.
Patch by brandonwilliams for CASSANDRA-6104
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30085323
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30085323
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 3876eefd1 - 300853232
refs/heads/cassandra-2.0 f1f8384a0 - 91e4d2288
refs/heads/cassandra-2.1 e23e57fff - 0ccee7f58
refs/heads/trunk fcd791ae7 - 51e41a7fb
Extend limits.conf in debian packaging.
Patch by brandonwilliams
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/0ccee7f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ccee7f5
Diff:
Extend limits.conf in debian packaging.
Patch by brandonwilliams for CASSANDRA-6104
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30085323
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30085323
Diff:
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/0ccee7f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ccee7f5
Diff:
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/91e4d228
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91e4d228
Diff:
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/91e4d228
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91e4d228
Diff:
Extend limits.conf in debian packaging.
Patch by brandonwilliams for CASSANDRA-6104
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30085323
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30085323
Diff:
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/51e41a7f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51e41a7f
Diff:
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/91e4d228
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91e4d228
Diff:
[
https://issues.apache.org/jira/browse/CASSANDRA-6104?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Brandon Williams resolved CASSANDRA-6104.
-
Resolution: Fixed
Fix Version/s: 2.1 beta2
2.0.7
Sylvain Lebresne created CASSANDRA-6888:
---
Summary: Store whether a counter sstable still use some
local/remote shards in the sstable metadata
Key: CASSANDRA-6888
URL:
[
https://issues.apache.org/jira/browse/CASSANDRA-6689?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Ryan McGuire updated CASSANDRA-6689:
Labels: performance (was: )
Partially Off Heap Memtables
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a45fea8f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a45fea8f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a45fea8f
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 91e4d2288 - 32c15c2fb
refs/heads/cassandra-2.1 0ccee7f58 - a45fea8fc
refs/heads/trunk 51e41a7fb - 96b55cecc
Add uuid() function
patch by Carl Yeksigian; reviewed by jbellis for CASSANDRA-6473
Project:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 32c15c2fb - c80f61b68
Add UNLOGGED, COUNTER options to BATCH docs
patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-6816
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 a45fea8fc - 2a2141ce6
Add UNLOGGED, COUNTER options to BATCH docs
patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-6816
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch 'cassandra-1.2' into cassandra-2.0
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/c80f61b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c80f61b6
Diff:
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/2a2141ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a2141ce
Diff:
Merge branch 'cassandra-1.2' into cassandra-2.0
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/c80f61b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c80f61b6
Diff:
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/2a2141ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a2141ce
Diff:
[
https://issues.apache.org/jira/browse/CASSANDRA-6836?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940683#comment-13940683
]
Irfan Nagoo commented on CASSANDRA-6836:
Sure, they look relevant.Thanks
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 2a2141ce6 - 75508ec89
http://git-wip-us.apache.org/repos/asf/cassandra/blob/75508ec8/test/unit/org/apache/cassandra/utils/FastByteOperationsTest.java
--
diff
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f057832
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f057832
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 00317fc8f - 9f057832e
http://git-wip-us.apache.org/repos/asf/cassandra/blob/75508ec8/test/unit/org/apache/cassandra/utils/FastByteOperationsTest.java
--
diff --git
Add uuid() function
patch by Carl Yeksigian; reviewed by jbellis for CASSANDRA-6473
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32c15c2f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32c15c2f
Diff:
[
https://issues.apache.org/jira/browse/CASSANDRA-6506?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940608#comment-13940608
]
Sylvain Lebresne commented on CASSANDRA-6506:
-
To me, the main interest of
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/00317fc8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00317fc8
Diff:
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a45fea8f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a45fea8f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a45fea8f
Add uuid() function
patch by Carl Yeksigian; reviewed by jbellis for CASSANDRA-6473
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32c15c2f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32c15c2f
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 300853232 - 7e870018d
Add UNLOGGED, COUNTER options to BATCH docs
patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-6816
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
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/96b55cec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96b55cec
Diff:
r/m unused code from ThriftServer/TServerFactory
patch by Ed Capriolo; reviewed by jbellis for CASSANDRA-6854
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ef3eeec
Tree:
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/f0227a6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0227a6c
Diff:
comment CqlRow for #6807
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73a3eeb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73a3eeb6
Diff:
comment CqlRow for #6807
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73a3eeb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73a3eeb6
Diff:
comment CqlRow for #6807
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73a3eeb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73a3eeb6
Diff:
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/335aa9f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/335aa9f1
Diff:
Merge remote-tracking branch 'origin/cassandra-2.1' 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/350657c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/350657c6
Diff:
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/dd276ebb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd276ebb
Diff:
[
https://issues.apache.org/jira/browse/CASSANDRA-6506?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940695#comment-13940695
]
Aleksey Yeschenko commented on CASSANDRA-6506:
--
Once we have
Repository: cassandra
Updated Branches:
refs/heads/trunk 96b55cecc - 00317fc8f
Add UNLOGGED, COUNTER options to BATCH docs
patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-6816
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
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/6e366e3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e366e3b
Diff:
Merge remote-tracking branch 'origin/cassandra-2.1' 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/350657c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/350657c6
Diff:
[
https://issues.apache.org/jira/browse/CASSANDRA-6783?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940701#comment-13940701
]
Tyler Hobbs commented on CASSANDRA-6783:
+1 with a minor nit: the
[
https://issues.apache.org/jira/browse/CASSANDRA-6807?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940700#comment-13940700
]
Jonathan Ellis commented on CASSANDRA-6807:
---
added a note to the
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 7e870018d - 73a3eeb6f
refs/heads/cassandra-2.0 c80f61b68 - dd276ebb5
refs/heads/cassandra-2.1 75508ec89 - 6e366e3b2
refs/heads/trunk 9f057832e - 335aa9f1f
r/m unused code from ThriftServer/TServerFactory
patch by Ed
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/dd276ebb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd276ebb
Diff:
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/dd276ebb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd276ebb
Diff:
[
https://issues.apache.org/jira/browse/CASSANDRA-6506?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940736#comment-13940736
]
Sylvain Lebresne commented on CASSANDRA-6506:
-
bq. With CASSANDRA-6717
[
https://issues.apache.org/jira/browse/CASSANDRA-6888?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Aleksey Yeschenko reassigned CASSANDRA-6888:
Assignee: Aleksey Yeschenko
Store whether a counter sstable still use
[
https://issues.apache.org/jira/browse/CASSANDRA-?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Anne Sullivan updated CASSANDRA-:
-
Attachment: cassandra_system.log.debug.gz
Avoid accumulating tombstones after
[
https://issues.apache.org/jira/browse/CASSANDRA-6506?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940643#comment-13940643
]
Aleksey Yeschenko commented on CASSANDRA-6506:
--
bq. I'm also
comment CqlRow for #6807
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73a3eeb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73a3eeb6
Diff:
Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e13b11d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e13b11d4
Diff:
[
https://issues.apache.org/jira/browse/CASSANDRA-6854?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940653#comment-13940653
]
Jonathan Ellis commented on CASSANDRA-6854:
---
LGTM, committed
TServerArgs
[
https://issues.apache.org/jira/browse/CASSANDRA-?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940757#comment-13940757
]
Anne Sullivan commented on CASSANDRA-:
--
Attached debug logs
[
https://issues.apache.org/jira/browse/CASSANDRA-6821?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940778#comment-13940778
]
Nick Bailey commented on CASSANDRA-6821:
It seems like you left some
[
https://issues.apache.org/jira/browse/CASSANDRA-6821?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13940811#comment-13940811
]
Nick Bailey commented on CASSANDRA-6821:
besides that it looks good.
Darla Baker created CASSANDRA-6889:
--
Summary: Add the ability to use a url as the input to the --file
parameter of cqlsh
Key: CASSANDRA-6889
URL: https://issues.apache.org/jira/browse/CASSANDRA-6889
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/6e366e3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e366e3b
Diff:
1 - 100 of 126 matches
Mail list logo