Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa1f9bab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa1f9bab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa1f9bab
Branch: refs/heads/trunk
Commit: fa1f9bab714db92f5b1cfc616e1717fd1aaa8b38
Parents: 0d4923f ddab67d
Author: Vijay Parthasarathy <[email protected]>
Authored: Fri Feb 1 12:30:40 2013 -0800
Committer: Vijay Parthasarathy <[email protected]>
Committed: Fri Feb 1 12:30:40 2013 -0800
----------------------------------------------------------------------
debian/cassandra.install | 1 +
.../locator/GossipingPropertyFileSnitch.java | 2 +-
.../apache/cassandra/locator/SnitchProperties.java | 6 +++++-
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa1f9bab/debian/cassandra.install
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa1f9bab/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
index a75f3f7,0674cfa..0b36a3c
--- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
@@@ -47,11 -45,7 +47,11 @@@ public class GossipingPropertyFileSnitc
myDC = SnitchProperties.get("dc", null);
myRack = SnitchProperties.get("rack", null);
if (myDC == null || myRack == null)
- throw new ConfigurationException("DC or rack not found in snitch
properties");
+ throw new ConfigurationException("DC or rack not found in snitch
properties, Plz check your configuration in: " +
SnitchProperties.RACKDC_PROPERTY_FILENAME);
+
+ myDC = myDC.trim();
+ myRack = myRack.trim();
+
try
{
psnitch = new PropertyFileSnitch();
