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/05/03 19:48:13 UTC
[1/6] git commit: fix indentation
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 af96d405b -> aa2b769aa
refs/heads/cassandra-2.1 c7c5f6841 -> 3bc4de96d
refs/heads/trunk 2bb867a2d -> 2bf6d8a68
fix indentation
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa2b769a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa2b769a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa2b769a
Branch: refs/heads/cassandra-2.0
Commit: aa2b769aacd968de9ace314a9219996d9ec7d097
Parents: af96d40
Author: Brandon Williams <br...@apache.org>
Authored: Sat May 3 12:44:02 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sat May 3 12:44:05 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa2b769a/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java b/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java
index 05fbea2..b4d3b19 100644
--- a/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java
+++ b/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java
@@ -53,15 +53,15 @@ public class GoogleCloudSnitch extends AbstractNetworkTopologySnitch
public GoogleCloudSnitch() throws IOException, ConfigurationException
{
String response = gceApiCall(ZONE_NAME_QUERY_URL);
- String[] splits = response.split("/");
- String az = splits[splits.length - 1];
+ String[] splits = response.split("/");
+ String az = splits[splits.length - 1];
// Split "us-central1-a" or "asia-east1-a" into "us-central1"/"a" and "asia-east1"/"a".
splits = az.split("-");
gceZone = splits[splits.length - 1];
- int lastRegionIndex = az.lastIndexOf("-");
- gceRegion = az.substring(0, lastRegionIndex);
+ int lastRegionIndex = az.lastIndexOf("-");
+ gceRegion = az.substring(0, lastRegionIndex);
String datacenterSuffix = (new SnitchProperties()).get("dc_suffix", "");
gceRegion = gceRegion.concat(datacenterSuffix);
[3/6] git commit: fix indentation
Posted by br...@apache.org.
fix indentation
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa2b769a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa2b769a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa2b769a
Branch: refs/heads/trunk
Commit: aa2b769aacd968de9ace314a9219996d9ec7d097
Parents: af96d40
Author: Brandon Williams <br...@apache.org>
Authored: Sat May 3 12:44:02 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sat May 3 12:44:05 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa2b769a/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java b/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java
index 05fbea2..b4d3b19 100644
--- a/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java
+++ b/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java
@@ -53,15 +53,15 @@ public class GoogleCloudSnitch extends AbstractNetworkTopologySnitch
public GoogleCloudSnitch() throws IOException, ConfigurationException
{
String response = gceApiCall(ZONE_NAME_QUERY_URL);
- String[] splits = response.split("/");
- String az = splits[splits.length - 1];
+ String[] splits = response.split("/");
+ String az = splits[splits.length - 1];
// Split "us-central1-a" or "asia-east1-a" into "us-central1"/"a" and "asia-east1"/"a".
splits = az.split("-");
gceZone = splits[splits.length - 1];
- int lastRegionIndex = az.lastIndexOf("-");
- gceRegion = az.substring(0, lastRegionIndex);
+ int lastRegionIndex = az.lastIndexOf("-");
+ gceRegion = az.substring(0, lastRegionIndex);
String datacenterSuffix = (new SnitchProperties()).get("dc_suffix", "");
gceRegion = gceRegion.concat(datacenterSuffix);
[6/6] 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/2bf6d8a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bf6d8a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bf6d8a6
Branch: refs/heads/trunk
Commit: 2bf6d8a68ddfa60dce7b2c3bdf531c5b51b650be
Parents: 2bb867a 3bc4de9
Author: Brandon Williams <br...@apache.org>
Authored: Sat May 3 12:44:23 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sat May 3 12:44:23 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3bc4de96
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bc4de96
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3bc4de96
Branch: refs/heads/trunk
Commit: 3bc4de96da07865498a7b3cda96daded68145d75
Parents: c7c5f68 aa2b769
Author: Brandon Williams <br...@apache.org>
Authored: Sat May 3 12:44:15 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sat May 3 12:44:15 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/6] git commit: fix indentation
Posted by br...@apache.org.
fix indentation
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa2b769a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa2b769a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa2b769a
Branch: refs/heads/cassandra-2.1
Commit: aa2b769aacd968de9ace314a9219996d9ec7d097
Parents: af96d40
Author: Brandon Williams <br...@apache.org>
Authored: Sat May 3 12:44:02 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sat May 3 12:44:05 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa2b769a/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java b/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java
index 05fbea2..b4d3b19 100644
--- a/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java
+++ b/src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java
@@ -53,15 +53,15 @@ public class GoogleCloudSnitch extends AbstractNetworkTopologySnitch
public GoogleCloudSnitch() throws IOException, ConfigurationException
{
String response = gceApiCall(ZONE_NAME_QUERY_URL);
- String[] splits = response.split("/");
- String az = splits[splits.length - 1];
+ String[] splits = response.split("/");
+ String az = splits[splits.length - 1];
// Split "us-central1-a" or "asia-east1-a" into "us-central1"/"a" and "asia-east1"/"a".
splits = az.split("-");
gceZone = splits[splits.length - 1];
- int lastRegionIndex = az.lastIndexOf("-");
- gceRegion = az.substring(0, lastRegionIndex);
+ int lastRegionIndex = az.lastIndexOf("-");
+ gceRegion = az.substring(0, lastRegionIndex);
String datacenterSuffix = (new SnitchProperties()).get("dc_suffix", "");
gceRegion = gceRegion.concat(datacenterSuffix);
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3bc4de96
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bc4de96
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3bc4de96
Branch: refs/heads/cassandra-2.1
Commit: 3bc4de96da07865498a7b3cda96daded68145d75
Parents: c7c5f68 aa2b769
Author: Brandon Williams <br...@apache.org>
Authored: Sat May 3 12:44:15 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sat May 3 12:44:15 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/GoogleCloudSnitch.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------