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/05/09 00:01:12 UTC
[1/2] git commit: whitespace
Updated Branches:
refs/heads/cassandra-1.2 29ad6bdca -> 6db71b29d
refs/heads/trunk 782536176 -> ae0d6ebd2
whitespace
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6db71b29
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6db71b29
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6db71b29
Branch: refs/heads/cassandra-1.2
Commit: 6db71b29d754eebdb64a9eab802b96af1e01595d
Parents: 29ad6bd
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 8 16:37:14 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 8 16:37:14 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6db71b29/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1abfc65..ca3f130 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -29,6 +29,7 @@ Merged from 1.1
* Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
* fsync leveled manifest to avoid corruption (CASSANDRA-5535)
+
1.2.4
* Ensure that PerRowSecondaryIndex updates see the most recent values
(CASSANDRA-5397)
[2/2] git commit: r/m redundant log line on startup
Posted by jb...@apache.org.
r/m redundant log line on startup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae0d6ebd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae0d6ebd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae0d6ebd
Branch: refs/heads/trunk
Commit: ae0d6ebd26389d9504456cf96582eb76c24c9ff3
Parents: 7825361
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 8 17:01:06 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 8 17:01:06 2013 -0500
----------------------------------------------------------------------
.../cassandra/config/DatabaseDescriptor.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae0d6ebd/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 89f4c77..8b1b223 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -377,8 +377,6 @@ public class DatabaseDescriptor
logger.info((conf.multithreaded_compaction ? "" : "Not ") + "using multi-threaded compaction");
- logger.info((conf.multithreaded_compaction ? "" : "Not ") + "using multi-threaded compaction");
-
if (conf.in_memory_compaction_limit_in_mb != null && conf.in_memory_compaction_limit_in_mb <= 0)
{
throw new ConfigurationException("in_memory_compaction_limit_in_mb must be a positive integer");