You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/06/02 06:02:29 UTC
[1/2] git commit: fix SnitchProperties logging context patch by
cburroughs reviewed by dbrosius for cassandra-5602
Updated Branches:
refs/heads/trunk dbf505056 -> 992d31f41
fix SnitchProperties logging context
patch by cburroughs reviewed by dbrosius for cassandra-5602
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/456e91d1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/456e91d1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/456e91d1
Branch: refs/heads/trunk
Commit: 456e91d182bf8d2cbcb82746cfff6c62af6f0150
Parents: c0c1492
Author: Dave Brosius <db...@apache.org>
Authored: Sat Jun 1 23:58:30 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sat Jun 1 23:58:30 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/locator/SnitchProperties.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/456e91d1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 83bbc04..8aa0138 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@
* cqlsh: add vertical output option (see EXPAND) (CASSANDRA-5597)
* Add a rate limit option to stress (CASSANDRA-5004)
* have BulkLoader ignore snapshots directories (CASSANDRA-5587)
+ * fix SnitchProperties logging context (CASSANDRA-5602)
Merged from 1.1:
* Remove buggy thrift max message length option (CASSANDRA-5529)
* Fix NPE in Pig's widerow mode (CASSANDRA-5488)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/456e91d1/src/java/org/apache/cassandra/locator/SnitchProperties.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/SnitchProperties.java b/src/java/org/apache/cassandra/locator/SnitchProperties.java
index ae27fbe..809a180 100644
--- a/src/java/org/apache/cassandra/locator/SnitchProperties.java
+++ b/src/java/org/apache/cassandra/locator/SnitchProperties.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
public class SnitchProperties
{
- private static final Logger logger = LoggerFactory.getLogger(GossipingPropertyFileSnitch.class);
+ private static final Logger logger = LoggerFactory.getLogger(SnitchProperties.class);
public static final String RACKDC_PROPERTY_FILENAME = "cassandra-rackdc.properties";
private static Properties properties = new Properties();
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by db...@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/992d31f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/992d31f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/992d31f4
Branch: refs/heads/trunk
Commit: 992d31f41cd0349a9c3952fca24e886df13ec6b1
Parents: dbf5050 456e91d
Author: Dave Brosius <db...@apache.org>
Authored: Sun Jun 2 00:00:39 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sun Jun 2 00:00:39 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/locator/SnitchProperties.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/992d31f4/CHANGES.txt
----------------------------------------------------------------------