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/04/21 21:47:28 UTC

[1/3] git commit: Default flush dir to data dir. Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 5c364016a -> 02d1e7497
  refs/heads/trunk 8a788e76a -> d224c0f87


Default flush dir to data dir.
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064


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

Branch: refs/heads/cassandra-2.1
Commit: 02d1e7497a9930120fac367ce82a3b22940acafb
Parents: 5c36401
Author: Brandon Williams <br...@apache.org>
Authored: Mon Apr 21 14:42:29 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Apr 21 14:42:29 2014 -0500

----------------------------------------------------------------------
 conf/cassandra.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02d1e749/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 07afd05..2ef4523 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -102,8 +102,9 @@ commitlog_directory: /var/lib/cassandra/commitlog
 
 # location to write flushing sstables to.  Ideally, this will also be
 # a separate spindle in HDD deployments.  If you only have two spindles,
-# have it share with the data spindle.
-flush_directory: /var/lib/cassandra/flush
+# have it share with the data spindle.  By default, this will point at the data
+# directory.
+# flush_directory: /var/lib/cassandra/flush
 
 # policy for data disk failures:
 # stop_paranoid: shut down gossip and Thrift even for single-sstable errors.


[2/3] git commit: Default flush dir to data dir. Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064

Posted by br...@apache.org.
Default flush dir to data dir.
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064


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

Branch: refs/heads/trunk
Commit: 02d1e7497a9930120fac367ce82a3b22940acafb
Parents: 5c36401
Author: Brandon Williams <br...@apache.org>
Authored: Mon Apr 21 14:42:29 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Apr 21 14:42:29 2014 -0500

----------------------------------------------------------------------
 conf/cassandra.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02d1e749/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 07afd05..2ef4523 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -102,8 +102,9 @@ commitlog_directory: /var/lib/cassandra/commitlog
 
 # location to write flushing sstables to.  Ideally, this will also be
 # a separate spindle in HDD deployments.  If you only have two spindles,
-# have it share with the data spindle.
-flush_directory: /var/lib/cassandra/flush
+# have it share with the data spindle.  By default, this will point at the data
+# directory.
+# flush_directory: /var/lib/cassandra/flush
 
 # policy for data disk failures:
 # stop_paranoid: shut down gossip and Thrift even for single-sstable errors.


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

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

Branch: refs/heads/trunk
Commit: d224c0f87c3f761572e22333dea2b2b00d05ed67
Parents: 8a788e7 02d1e74
Author: Brandon Williams <br...@apache.org>
Authored: Mon Apr 21 14:43:41 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Apr 21 14:43:41 2014 -0500

----------------------------------------------------------------------
 conf/cassandra.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------