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/14 23:15:22 UTC

[1/2] git commit: ninja change default back to heap_buffers

Repository: cassandra
Updated Branches:
  refs/heads/trunk 1d508f7f6 -> 8243b6ad0


ninja change default back to heap_buffers


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

Branch: refs/heads/trunk
Commit: f45a4e3a1e720c3ba34c9eb04aa6566486f6e331
Parents: 88f9c92
Author: Jake Luciani <ja...@apache.org>
Authored: Mon Jul 14 17:11:57 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Mon Jul 14 17:11:57 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f45a4e3a/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 061b89d..e98eb66 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -290,7 +290,7 @@ memtable_cleanup_threshold: 0.4
 #   heap_buffers:    on heap nio buffers
 #   offheap_buffers: off heap (direct) nio buffers
 #   offheap_objects: native memory, eliminating nio buffer heap overhead
-memtable_allocation_type: offheap_objects
+memtable_allocation_type: heap_buffers
 
 # Total space to use for commitlogs.  Since commitlog segments are
 # mmapped, and hence use up address space, the default size is 32

[2/2] 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/8243b6ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8243b6ad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8243b6ad

Branch: refs/heads/trunk
Commit: 8243b6ad0deca4d6f43e41108ca0d79cbd918a35
Parents: 1d508f7 f45a4e3
Author: Jake Luciani <ja...@apache.org>
Authored: Mon Jul 14 17:15:05 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Mon Jul 14 17:15:05 2014 -0400

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