[
https://issues.apache.org/jira/browse/CASSANDRA-7199?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13993570#comment-13993570
]
Michael Shuler commented on CASSANDRA-7199:
---
happened on Revision:
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56136946
Tree:
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/af802014
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af802014
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/211d81c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/211d81c2
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/355e69b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/355e69b7
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 0ca494240 - 411abc78e
Raise the phi convict threshold check in 1.2
patch by tjake; reviewed by jbellis for CASSANDRA-7063
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/66429d61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66429d61
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 259e17df3 - 361ad681e
refs/heads/trunk b7d5f5a16 - 17afc08d6
More aggressive waiting in KeyCacheTest
Patch by Benedict, reviewed by brandonwilliams for CASSANDRA-7167
Project:
Make commitlog archive+restore more robust
patch by bes; reviewed by jbellis for CASSANDRA-6974
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/134e0226
Tree:
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/7b398c52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b398c52
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 11c8a2270 - c807b42d7
Fix IllegalStateException in CqlPagingRecordReader for inputPageRowSize
patch by btheisen reviewed by dbrosius for cassandra-7198
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
CQLSH: adjusted compaction_strategy_options with the latest docs
patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7185
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a626c6dc
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 355e69b7f - a89fd4d1d
Ninja: add missing enabled option to compaction options docs
Done for CASSANDRA-7185
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
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/af802014
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af802014
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 311c27642 - ce7bf5e99
refs/heads/trunk c37cceef5 - d6eb9e8bd
Add snapshot manifest describing files included
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6326
Project:
Merge branch 'cassandra-1.2' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/411abc78
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/11c8a227
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11c8a227
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/0ca49424
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ca49424
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk adea05f58 - fe2d7ddaf
Starting threads in the OutboundTcpConnectionPool constructor causes race
conditions
patch by sbtourist; reviewed by jasobrown for CASSANDRA-7177
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 dceb739f3 - c4fcb1669
return all cpu values from BackgroundActivityMonitor.readAndCompute
patch by dbrosius reviewed by jbellis for cassandra-7183
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
assume allNodesAtLeast21 until demonstrated otherwise; see CASSANDRA-7161
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef35641e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef35641e
Diff:
Fix CollectionTypeTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b299c4c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b299c4c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b299c4c
Repository: cassandra
Updated Branches:
refs/heads/trunk 677df414d - 94c029924
Ninja: add missing enabled option to compaction options docs
Done for CASSANDRA-7185
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 0cb1db68f - 60dbe8b70
Fix broken build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60dbe8b7
Tree:
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/75023593
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/75023593
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/fb0a78a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb0a78a2
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 d267cf88c - 773b95efb
reduce garbage creation in calculatePendingRanges
patch by dbrosius reviewed by bwilliams for cassandra-7191
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/39342b99
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39342b99
Diff:
[
https://issues.apache.org/jira/browse/CASSANDRA-6575?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13993155#comment-13993155
]
Jonathan Ellis commented on CASSANDRA-6575:
---
committed
By default,
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/6e793428
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e793428
Diff:
[
https://issues.apache.org/jira/browse/CASSANDRA-7194?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Joshua McKenzie updated CASSANDRA-7194:
---
Attachment: 7194_v1.patch
Trivial platform-independent newline issue
CliTest
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/4d9da02f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d9da02f
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 a89fd4d1d - 0b26c778b
refs/heads/trunk 94c029924 - 10aef4d87
inline
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b26c778
Tree:
[
https://issues.apache.org/jira/browse/CASSANDRA-6563?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Paulo Ricardo Motta Gomes updated CASSANDRA-6563:
-
Attachment: 2.0.7-CASSANDRA-6563.txt
Attached patch for
[
https://issues.apache.org/jira/browse/CASSANDRA-7036?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13992802#comment-13992802
]
Brandon Williams commented on CASSANDRA-7036:
-
Fixed those problems here:
[
https://issues.apache.org/jira/browse/CASSANDRA-6563?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13992809#comment-13992809
]
Paulo Ricardo Motta Gomes commented on CASSANDRA-6563:
--
I've also
[
https://issues.apache.org/jira/browse/CASSANDRA-7196?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13993425#comment-13993425
]
Mikhail Stepura commented on CASSANDRA-7196:
Expected result, just in
[
https://issues.apache.org/jira/browse/CASSANDRA-7189?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13993444#comment-13993444
]
Marcus Eriksson commented on CASSANDRA-7189:
+1
nit, i guess we can
[
https://issues.apache.org/jira/browse/CASSANDRA-6572?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13993455#comment-13993455
]
Lyuben Todorov commented on CASSANDRA-6572:
---
I'm not too sure about the
[
https://issues.apache.org/jira/browse/CASSANDRA-7204?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Brandon Williams resolved CASSANDRA-7204.
-
Resolution: Duplicate
'nodetool status' does not show joining node
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
conf/cassandra-env.sh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8c58dd30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c58dd30
[
https://issues.apache.org/jira/browse/CASSANDRA-7199?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13993636#comment-13993636
]
Michael Shuler commented on CASSANDRA-7199:
---
I queued a job on the same box
[
https://issues.apache.org/jira/browse/CASSANDRA-7100?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Jonathan Ellis updated CASSANDRA-7100:
--
Reviewer: Piotr Kołaczkowski (was: Jonathan Ellis)
Regression in 2.0.x - Cql3
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/2629c30a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2629c30a
Diff:
cqlsh should return a non-zero error code if a query fails
patch by Branden Visser and Mikhail Stepura; reviewed by Mikhail Stepura for
CASSANDRA-6344
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8abe9f6f
Tree:
Philip Thompson created CASSANDRA-7202:
--
Summary: Update ccm for windows launch script changes from #7001
Key: CASSANDRA-7202
URL: https://issues.apache.org/jira/browse/CASSANDRA-7202
Project:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 ce7bf5e99 - 39b0d0e3e
refs/heads/trunk d6eb9e8bd - 9ffb19569
don't use o.a.commons.io for one method
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/28497fd1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/28497fd1
Diff:
[
https://issues.apache.org/jira/browse/CASSANDRA-6998?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13994200#comment-13994200
]
Muhammad Adel commented on CASSANDRA-6998:
--
Sorry if I didn't make myself
49 matches
Mail list logo