[2/3] git commit: typo
typo Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f9d0505 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f9d0505 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f9d0505 Branch: refs/heads/cassandra-2.1 Commit: 4f9d0505a86153dd7006cc18611fb2096425d44f Parents: ad81cab Author: Jonathan Ellis jbel...@apache.org Authored: Fri Mar 21 22:11:22 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Mar 25 13:19:24 2014 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f9d0505/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 81fba5f..373544c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -247,7 +247,7 @@ Merged from 1.2: 2.0.2 * Update FailureDetector to use nanontime (CASSANDRA-4925) * Fix FileCacheService regressions (CASSANDRA-6149) - * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6132) * Fix race conditions in bulk loader (CASSANDRA-6129) * Add configurable metrics reporting (CASSANDRA-4430) * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
[2/3] git commit: typo
typo Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bad3523 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bad3523 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bad3523 Branch: refs/heads/trunk Commit: 7bad35230c7be2c80311373edd4d0464d2b15cd4 Parents: 6716009 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Apr 5 16:57:51 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Apr 5 16:57:51 2013 -0500 -- .../org/apache/cassandra/tools/NodeToolHelp.yaml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bad3523/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml -- diff --git a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml index 61cf1fe..d3e8436 100644 --- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml +++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml @@ -155,7 +155,7 @@ commands: - name: getcompactionthreshold keyspace cfname help: | Print min and max compaction thresholds for a given column family - - name: stop compacion_type + - name: stop compaction_type help: | Supported types are COMPACTION, VALIDATION, CLEANUP, SCRUB, INDEX_BUILD - name: cfhistograms keyspace cfname
[2/3] git commit: typo
typo Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6206d8ab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6206d8ab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6206d8ab Branch: refs/heads/trunk Commit: 6206d8ab86fb422ad4095773b59b4f9638def960 Parents: 15214fe Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Feb 1 15:48:50 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Feb 1 15:48:50 2013 -0600 -- .../locator/GossipingPropertyFileSnitch.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6206d8ab/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java -- diff --git a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java index 0b36a3c..e08a27e 100644 --- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java +++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java @@ -47,7 +47,7 @@ public class GossipingPropertyFileSnitch extends AbstractNetworkTopologySnitch 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, Plz check your configuration in: + SnitchProperties.RACKDC_PROPERTY_FILENAME); +throw new ConfigurationException(DC or rack not found in snitch properties, check your configuration in: + SnitchProperties.RACKDC_PROPERTY_FILENAME); myDC = myDC.trim(); myRack = myRack.trim();
