You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/01/22 22:34:19 UTC
[1/3] git commit: fix yaml comment for 6059
Updated Branches:
refs/heads/cassandra-2.0 9c9881807 -> 6348ce0cc
refs/heads/trunk d86e1dd61 -> b9260092d
fix yaml comment for 6059
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6348ce0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6348ce0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6348ce0c
Branch: refs/heads/cassandra-2.0
Commit: 6348ce0cc5f8aa4e8da7f4df09a404e4d626bf4b
Parents: 9c98818
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 22 15:32:17 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jan 22 15:32:17 2014 -0600
----------------------------------------------------------------------
conf/cassandra.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6348ce0c/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index e10afb6..db924bb 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -248,7 +248,7 @@ concurrent_writes: 32
# Total memory to use for memtables. Cassandra will flush the largest
# memtable when this much memory is used.
-# If omitted, Cassandra will set it to 1/3 of the heap.
+# If omitted, Cassandra will set it to 1/4 of the heap.
# memtable_total_space_in_mb: 2048
# Total space to use for commitlogs. Since commitlog segments are
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
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/b9260092
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9260092
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9260092
Branch: refs/heads/trunk
Commit: b9260092dabb90c9a50d773d5a94b184766a50ee
Parents: d86e1dd 6348ce0
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 22 15:32:23 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jan 22 15:32:23 2014 -0600
----------------------------------------------------------------------
conf/cassandra.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9260092/conf/cassandra.yaml
----------------------------------------------------------------------
[2/3] git commit: fix yaml comment for 6059
Posted by br...@apache.org.
fix yaml comment for 6059
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6348ce0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6348ce0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6348ce0c
Branch: refs/heads/trunk
Commit: 6348ce0cc5f8aa4e8da7f4df09a404e4d626bf4b
Parents: 9c98818
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 22 15:32:17 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jan 22 15:32:17 2014 -0600
----------------------------------------------------------------------
conf/cassandra.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6348ce0c/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index e10afb6..db924bb 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -248,7 +248,7 @@ concurrent_writes: 32
# Total memory to use for memtables. Cassandra will flush the largest
# memtable when this much memory is used.
-# If omitted, Cassandra will set it to 1/3 of the heap.
+# If omitted, Cassandra will set it to 1/4 of the heap.
# memtable_total_space_in_mb: 2048
# Total space to use for commitlogs. Since commitlog segments are