You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/04/14 06:47:11 UTC

[1/2] git commit: comments

Updated Branches:
  refs/heads/trunk e269cf116 -> 704eb97a6


comments


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

Branch: refs/heads/trunk
Commit: 77e3b5c0bc8a817091fdfcfa78b7c486554dc4f4
Parents: 0f1fb43
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Apr 13 23:45:40 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Apr 13 23:45:40 2013 -0500

----------------------------------------------------------------------
 conf/cassandra.yaml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/77e3b5c0/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 6eb0c6b..22e136c 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -102,7 +102,9 @@ permissions_validity_in_ms: 2000
 # partitioners and token selection.
 partitioner: org.apache.cassandra.dht.Murmur3Partitioner
 
-# directories where Cassandra should store data on disk.
+# Directories where Cassandra should store data on disk.  Cassandra
+# will spread data evenly across them, subject to the granularity of
+# the configured compaction strategy.
 data_file_directories:
     - /var/lib/cassandra/data
 


[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 704eb97a66e1ff238bcd1c0c5caa1db1174b15cc
Parents: e269cf1 77e3b5c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Apr 13 23:46:53 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Apr 13 23:46:53 2013 -0500

----------------------------------------------------------------------
 conf/cassandra.yaml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/704eb97a/conf/cassandra.yaml
----------------------------------------------------------------------