You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/07/01 20:40:24 UTC

[1/3] git commit: ninja fix: raise default concurrent compactors to 4 to avoid LCS test timeout

Repository: cassandra
Updated Branches:
  refs/heads/trunk 9cfde473b -> b192acbbd


ninja fix: raise default concurrent compactors to 4 to avoid LCS test timeout


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

Branch: refs/heads/trunk
Commit: 3958fc4592b2263f8e8db1f027f9d84b9f365b05
Parents: 4c9afde
Author: Jake Luciani <ja...@apache.org>
Authored: Tue Jul 1 14:39:12 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Tue Jul 1 14:39:12 2014 -0400

----------------------------------------------------------------------
 test/conf/cassandra.yaml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3958fc45/test/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/test/conf/cassandra.yaml b/test/conf/cassandra.yaml
index 26d0ee5..43995e6 100644
--- a/test/conf/cassandra.yaml
+++ b/test/conf/cassandra.yaml
@@ -33,4 +33,5 @@ server_encryption_options:
     truststore: conf/.truststore
     truststore_password: cassandra
 incremental_backups: true
+concurrent_compactors: 4
 compaction_throughput_mb_per_sec: 0


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

Posted by ja...@apache.org.
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/b192acbb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b192acbb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b192acbb

Branch: refs/heads/trunk
Commit: b192acbbdaee02050c2286e5b2b610c02977439d
Parents: 9cfde47 c70daa8
Author: Jake Luciani <ja...@apache.org>
Authored: Tue Jul 1 14:40:13 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Tue Jul 1 14:40:13 2014 -0400

----------------------------------------------------------------------
 test/conf/cassandra.yaml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------



[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Posted by ja...@apache.org.
Merge branch 'cassandra-2.1.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/c70daa8e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c70daa8e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c70daa8e

Branch: refs/heads/trunk
Commit: c70daa8ed3ff70868815ed7ccd032b69bc0b5d7c
Parents: 5dc04e7 3958fc4
Author: Jake Luciani <ja...@apache.org>
Authored: Tue Jul 1 14:39:47 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Tue Jul 1 14:39:47 2014 -0400

----------------------------------------------------------------------
 test/conf/cassandra.yaml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------