cassandra git commit: Fix typo in install from tarball doc

[mshuler]

Repository: cassandra
Updated Branches:
  refs/heads/trunk f081558d6 -> 1e6b7084b


Fix typo in install from tarball doc


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e6b7084
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e6b7084
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e6b7084

Branch: refs/heads/trunk
Commit: 1e6b7084baf35c51bdfc605d82556a4b250b375a
Parents: f081558
Author: Michael Shuler 
Authored: Thu Jul 12 21:56:33 2018 -0500
Committer: Michael Shuler 
Committed: Thu Jul 12 21:56:33 2018 -0500

--
 doc/source/getting_started/installing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e6b7084/doc/source/getting_started/installing.rst
--
diff --git a/doc/source/getting_started/installing.rst 
b/doc/source/getting_started/installing.rst
index 1a7b8ad..f607028 100644
--- a/doc/source/getting_started/installing.rst
+++ b/doc/source/getting_started/installing.rst
@@ -38,7 +38,7 @@ Installation from binary tarball files
 
 ::
 
-tar -xvf apache-cassandra-3.6-bin.tar.gz cassandra
+tar -xvf apache-cassandra-3.6-bin.tar.gz
 
 The files will be extracted into ``apache-cassandra-3.6``, you need to 
substitute 3.6 with the release number that you
 have downloaded.


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

cassandra-dtest git commit: Fix typo in write_failures_test: enocde() -> encode()

[spod]

Repository: cassandra-dtest
Updated Branches:
  refs/heads/master b76b49e6a -> 5276d89b6


Fix typo in write_failures_test: enocde() -> encode()


Project: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/commit/5276d89b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/tree/5276d89b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/diff/5276d89b

Branch: refs/heads/master
Commit: 5276d89b64593f2809ed050ef8aefbf7cd10eb18
Parents: b76b49e
Author: Stefan Podkowinski 
Authored: Wed Jun 27 08:42:17 2018 +0200
Committer: Stefan Podkowinski 
Committed: Wed Jun 27 08:42:17 2018 +0200

--
 write_failures_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/5276d89b/write_failures_test.py
--
diff --git a/write_failures_test.py b/write_failures_test.py
index 67bb22a..ece6245 100644
--- a/write_failures_test.py
+++ b/write_failures_test.py
@@ -224,7 +224,7 @@ class TestWriteFailures(Tester):
 with pytest.raises(self.expected_expt):
 client.insert('key1'.encode(),
   thrift_types.ColumnParent('mytable'),
-  thrift_types.Column('value'.encode(), 'Value 
1'.enocde(), 0),
+  thrift_types.Column('value'.encode(), 'Value 
1'.encode(), 0),
   thrift_types.ConsistencyLevel.ALL)
 
 client.transport.close()


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

cassandra git commit: Fix typo in snitch.rst

[bdeggleston]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 173dbab24 -> b87f79798


Fix typo in snitch.rst

Patch by Dongqi Xue; Reviewed by Blake Eggleston for CASSANDRA-13520


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b87f7979
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b87f7979
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b87f7979

Branch: refs/heads/trunk
Commit: b87f79798ca244006906c41e31d35a84112b54be
Parents: 173dbab
Author: Dongqi Xue 
Authored: Wed May 10 11:58:09 2017 -0700
Committer: Blake Eggleston 
Committed: Mon May 15 09:50:42 2017 -0700

--
 doc/source/operating/snitch.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b87f7979/doc/source/operating/snitch.rst
--
diff --git a/doc/source/operating/snitch.rst b/doc/source/operating/snitch.rst
index faea0b3..91bab29 100644
--- a/doc/source/operating/snitch.rst
+++ b/doc/source/operating/snitch.rst
@@ -45,7 +45,7 @@ configured with the following properties on 
``cassandra.yaml``:
 Snitch classes
 ^^
 
-The ``endpoint_snitch`` parameter in ``cassandra.yaml`` should be set to the 
class the class that implements
+The ``endpoint_snitch`` parameter in ``cassandra.yaml`` should be set to the 
class that implements
 ``IEndPointSnitch`` which will be wrapped by the dynamic snitch and decide if 
two endpoints are in the same data center
 or on the same rack. Out of the box, Cassandra provides the snitch 
implementations:
 


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

cassandra git commit: Fix typo in TokenAllocation logging

[dikang]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 305de286b -> 4d15f2d06


Fix typo in TokenAllocation logging


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d15f2d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d15f2d0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d15f2d0

Branch: refs/heads/trunk
Commit: 4d15f2d065649c62b55625f739f61eadb0fac174
Parents: 305de28
Author: Dikang Gu 
Authored: Wed Apr 5 12:01:23 2017 -0700
Committer: Dikang Gu 
Committed: Wed Apr 5 12:01:23 2017 -0700

--
 .../org/apache/cassandra/dht/tokenallocator/TokenAllocation.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d15f2d0/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java
--
diff --git 
a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java 
b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java
index 1d06b11..7c9d22c 100644
--- a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java
+++ b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java
@@ -62,8 +62,8 @@ public class TokenAllocation
 SummaryStatistics os = replicatedOwnershipStats(tokenMetadataCopy, 
rs, endpoint);
 tokenMetadataCopy.updateNormalTokens(tokens, endpoint);
 SummaryStatistics ns = replicatedOwnershipStats(tokenMetadataCopy, 
rs, endpoint);
-logger.warn("Replicated node load in datacentre before allocation 
{}", statToString(os));
-logger.warn("Replicated node load in datacentre after allocation 
{}", statToString(ns));
+logger.warn("Replicated node load in datacenter before allocation 
{}", statToString(os));
+logger.warn("Replicated node load in datacenter after allocation 
{}", statToString(ns));
 
 // TODO: Is it worth doing the replicated ownership calculation 
always to be able to raise this alarm?
 if (ns.getStandardDeviation() > os.getStandardDeviation())

[2/2] cassandra git commit: Fix typo in exception message

[jjirsa]

Fix typo in exception message

Closes #102

Patch by Bruno P. Kinoshita ; Reviewed by Jeff Jirsa for CASSANDRA-13381


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23cd27fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23cd27fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23cd27fc

Branch: refs/heads/trunk
Commit: 23cd27fcfac32d6bbbadf0211472585452021410
Parents: 595d586
Author: Bruno P. Kinoshita 
Authored: Sun Mar 26 22:59:27 2017 +1300
Committer: Jeff Jirsa 
Committed: Sun Mar 26 19:44:24 2017 -0700

--
 src/java/org/apache/cassandra/db/Clustering.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/23cd27fc/src/java/org/apache/cassandra/db/Clustering.java
--
diff --git a/src/java/org/apache/cassandra/db/Clustering.java 
b/src/java/org/apache/cassandra/db/Clustering.java
index 772961f..e585a8f 100644
--- a/src/java/org/apache/cassandra/db/Clustering.java
+++ b/src/java/org/apache/cassandra/db/Clustering.java
@@ -140,7 +140,7 @@ public interface Clustering extends ClusteringPrefix
 }
 catch (IOException e)
 {
-throw new RuntimeException("Writting to an in-memory buffer 
shouldn't trigger an IOException", e);
+throw new RuntimeException("Writing to an in-memory buffer 
shouldn't trigger an IOException", e);
 }
 }
 

[1/2] cassandra git commit: Fix typo in SSTableMetadataViewer: Clustring -> Clustering

[jjirsa]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 732d1af86 -> 23cd27fcf


Fix typo in SSTableMetadataViewer: Clustring -> Clustering

Closes #101

Patch by Gabriel Garcia; Reviewed by Jeff Jirsa for CASSANDRA-13380


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/595d5869
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/595d5869
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/595d5869

Branch: refs/heads/trunk
Commit: 595d58694e095d1a8a180853eb464937f36d1af0
Parents: 732d1af
Author: Gabriel Garcia 
Authored: Sat Mar 25 08:15:33 2017 -0400
Committer: Jeff Jirsa 
Committed: Sun Mar 26 19:42:02 2017 -0700

--
 src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/595d5869/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java
--
diff --git a/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java 
b/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java
index 63c7f96..2f6aca0 100644
--- a/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java
+++ b/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java
@@ -129,8 +129,8 @@ public class SSTableMetadataViewer
 minValues[i] = 
clusteringTypes.get(i).getString(minClusteringValues.get(i));
 maxValues[i] = 
clusteringTypes.get(i).getString(maxClusteringValues.get(i));
 }
-out.printf("minClustringValues: %s%n", 
Arrays.toString(minValues));
-out.printf("maxClustringValues: %s%n", 
Arrays.toString(maxValues));
+out.printf("minClusteringValues: %s%n", 
Arrays.toString(minValues));
+out.printf("maxClusteringValues: %s%n", 
Arrays.toString(maxValues));
 }
 out.printf("Estimated droppable tombstones: %s%n", 
stats.getEstimatedDroppableTombstoneRatio((int) (System.currentTimeMillis() / 
1000) - gcgs));
 out.printf("SSTable Level: %d%n", stats.sstableLevel);

cassandra git commit: Fix typo in stress JavaDriverClient.java

[jjirsa]

Repository: cassandra
Updated Branches:
  refs/heads/trunk dd5326646 -> 5b8b1ce26


Fix typo in stress JavaDriverClient.java

Closes #97

Patch by Ian Macalinao; Reviewed by Jeff Jirsa for CASSANDRA-13355


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b8b1ce2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b8b1ce2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b8b1ce2

Branch: refs/heads/trunk
Commit: 5b8b1ce26cd073a44ddf7c7a6750da409a343eba
Parents: dd53266
Author: Ian Macalinao 
Authored: Thu Mar 9 23:35:42 2017 -0600
Committer: Jeff Jirsa 
Committed: Mon Mar 20 14:50:01 2017 -0700

--
 .../src/org/apache/cassandra/stress/util/JavaDriverClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b8b1ce2/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
--
diff --git 
a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java 
b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
index e0b4262..3a7c513 100644
--- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
+++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
@@ -165,7 +165,7 @@ public class JavaDriverClient
 connectionsPerHost);
 for (Host host : metadata.getAllHosts())
 {
-System.out.printf("Datatacenter: %s; Host: %s; Rack: %s%n",
+System.out.printf("Datacenter: %s; Host: %s; Rack: %s%n",
 host.getDatacenter(), host.getAddress(), host.getRack());
 }
 

cassandra git commit: Fix typo: Pptions -> Options

[jjirsa]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 5ec97afce -> 091e5fbe4


Fix typo: Pptions -> Options

Closes #99

Patch by Gabriel Garcia; Reviewed by Jeff Jirsa for CASSANDRA-13349


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/091e5fbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/091e5fbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/091e5fbe

Branch: refs/heads/trunk
Commit: 091e5fbe418004fd04390a0b1a3486167360
Parents: 5ec97af
Author: Gabriel Garcia 
Authored: Sat Mar 18 12:05:51 2017 -0400
Committer: Jeff Jirsa 
Committed: Sat Mar 18 12:55:06 2017 -0700

--
 .../src/org/apache/cassandra/stress/settings/SettingsSchema.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/091e5fbe/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java
--
diff --git 
a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java 
b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java
index aa321a3..872f7dd 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java
@@ -222,7 +222,7 @@ public class SettingsSchema implements Serializable
 {
 out.println("  Keyspace: " + keyspace);
 out.println("  Replication Strategy: " + replicationStrategy);
-out.println("  Replication Strategy Pptions: " + 
replicationStrategyOptions);
+out.println("  Replication Strategy Options: " + 
replicationStrategyOptions);
 
 out.println("  Table Compression: " + compression);
 out.println("  Table Compaction Strategy: " + compactionStrategy);

cassandra git commit: Fix typo in documentation

[jjirsa]

Repository: cassandra
Updated Branches:
  refs/heads/trunk dd5251c46 -> 666a00089


Fix typo in documentation

Patch by Suresh C; Reviewed by Anthony Grasso  for CASSANDRA-12719


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/666a0008
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/666a0008
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/666a0008

Branch: refs/heads/trunk
Commit: 666a00089cb40f8d84f2974070b18c0744acbb9b
Parents: dd5251c
Author: Suresh 
Authored: Mon Dec 12 22:39:43 2016 +
Committer: Jeff Jirsa 
Committed: Sun Mar 12 22:02:26 2017 -0700

--
 doc/source/cql/ddl.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/666a0008/doc/source/cql/ddl.rst
--
diff --git a/doc/source/cql/ddl.rst b/doc/source/cql/ddl.rst
index fb97e54..756b18e 100644
--- a/doc/source/cql/ddl.rst
+++ b/doc/source/cql/ddl.rst
@@ -359,7 +359,7 @@ instance, given::
 a int,
 b int,
 c int,
-PRIMARY KEY (a, c, d)
+PRIMARY KEY (a, b, c)
 );
 
 SELECT * FROM t;

[1/3] cassandra git commit: fix typo: wrong if guard variable

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 187636c47 -> da4147628


fix typo: wrong if guard variable


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eaced9a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eaced9a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eaced9a5

Branch: refs/heads/trunk
Commit: eaced9a541d09d55973b6f88d720e16ac948a559
Parents: b987678
Author: Dave Brosius 
Authored: Thu Dec 22 20:19:53 2016 -0500
Committer: Dave Brosius 
Committed: Thu Dec 22 20:19:53 2016 -0500

--
 src/java/org/apache/cassandra/index/SecondaryIndexManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eaced9a5/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
--
diff --git a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java 
b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
index 0cb0334..6adefbd 100644
--- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@ -426,7 +426,7 @@ public class SecondaryIndexManager implements IndexRegistry
 {
 Class indexClass = 
FBUtilities.classForName(className, "Index");
 Constructor ctor = 
indexClass.getConstructor(ColumnFamilyStore.class, IndexMetadata.class);
-newIndex = (Index)ctor.newInstance(baseCfs, indexDef);
+newIndex = ctor.newInstance(baseCfs, indexDef);
 }
 catch (Exception e)
 {
@@ -615,7 +615,7 @@ public class SecondaryIndexManager implements IndexRegistry
 return DEFAULT_PAGE_SIZE;
 
 int columnsPerRow = 
baseCfs.metadata.partitionColumns().regulars.size();
-if (meanCellsPerPartition <= 0)
+if (columnsPerRow <= 0)
 return DEFAULT_PAGE_SIZE;
 
 int meanRowsPerPartition = meanCellsPerPartition / columnsPerRow;

[1/2] cassandra git commit: fix typo: wrong if guard variable

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.X f6b4ab417 -> 0d4fdadbf


fix typo: wrong if guard variable


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eaced9a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eaced9a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eaced9a5

Branch: refs/heads/cassandra-3.X
Commit: eaced9a541d09d55973b6f88d720e16ac948a559
Parents: b987678
Author: Dave Brosius 
Authored: Thu Dec 22 20:19:53 2016 -0500
Committer: Dave Brosius 
Committed: Thu Dec 22 20:19:53 2016 -0500

--
 src/java/org/apache/cassandra/index/SecondaryIndexManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eaced9a5/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
--
diff --git a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java 
b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
index 0cb0334..6adefbd 100644
--- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@ -426,7 +426,7 @@ public class SecondaryIndexManager implements IndexRegistry
 {
 Class indexClass = 
FBUtilities.classForName(className, "Index");
 Constructor ctor = 
indexClass.getConstructor(ColumnFamilyStore.class, IndexMetadata.class);
-newIndex = (Index)ctor.newInstance(baseCfs, indexDef);
+newIndex = ctor.newInstance(baseCfs, indexDef);
 }
 catch (Exception e)
 {
@@ -615,7 +615,7 @@ public class SecondaryIndexManager implements IndexRegistry
 return DEFAULT_PAGE_SIZE;
 
 int columnsPerRow = 
baseCfs.metadata.partitionColumns().regulars.size();
-if (meanCellsPerPartition <= 0)
+if (columnsPerRow <= 0)
 return DEFAULT_PAGE_SIZE;
 
 int meanRowsPerPartition = meanCellsPerPartition / columnsPerRow;

cassandra git commit: fix typo: wrong if guard variable

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 b98767868 -> eaced9a54


fix typo: wrong if guard variable


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eaced9a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eaced9a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eaced9a5

Branch: refs/heads/cassandra-3.11
Commit: eaced9a541d09d55973b6f88d720e16ac948a559
Parents: b987678
Author: Dave Brosius 
Authored: Thu Dec 22 20:19:53 2016 -0500
Committer: Dave Brosius 
Committed: Thu Dec 22 20:19:53 2016 -0500

--
 src/java/org/apache/cassandra/index/SecondaryIndexManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eaced9a5/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
--
diff --git a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java 
b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
index 0cb0334..6adefbd 100644
--- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@ -426,7 +426,7 @@ public class SecondaryIndexManager implements IndexRegistry
 {
 Class indexClass = 
FBUtilities.classForName(className, "Index");
 Constructor ctor = 
indexClass.getConstructor(ColumnFamilyStore.class, IndexMetadata.class);
-newIndex = (Index)ctor.newInstance(baseCfs, indexDef);
+newIndex = ctor.newInstance(baseCfs, indexDef);
 }
 catch (Exception e)
 {
@@ -615,7 +615,7 @@ public class SecondaryIndexManager implements IndexRegistry
 return DEFAULT_PAGE_SIZE;
 
 int columnsPerRow = 
baseCfs.metadata.partitionColumns().regulars.size();
-if (meanCellsPerPartition <= 0)
+if (columnsPerRow <= 0)
 return DEFAULT_PAGE_SIZE;
 
 int meanRowsPerPartition = meanCellsPerPartition / columnsPerRow;

cassandra git commit: fix typo introduced in #12142, regarding version constants

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/trunk f531c67d6 -> 0e23d175a


fix typo introduced in #12142, regarding version constants


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e23d175
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e23d175
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e23d175

Branch: refs/heads/trunk
Commit: 0e23d175ae0538e2360d1f18f30619d537d82ed2
Parents: f531c67
Author: Dave Brosius 
Authored: Wed Aug 3 23:47:12 2016 -0400
Committer: Dave Brosius 
Committed: Wed Aug 3 23:47:12 2016 -0400

--
 src/java/org/apache/cassandra/transport/Event.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e23d175/src/java/org/apache/cassandra/transport/Event.java
--
diff --git a/src/java/org/apache/cassandra/transport/Event.java 
b/src/java/org/apache/cassandra/transport/Event.java
index 232d817..618d722 100644
--- a/src/java/org/apache/cassandra/transport/Event.java
+++ b/src/java/org/apache/cassandra/transport/Event.java
@@ -345,7 +345,7 @@ public abstract class Event
 {
 if (target == Target.FUNCTION || target == Target.AGGREGATE)
 {
-if (version >= Server.VERSION_3)
+if (version >= Server.VERSION_4)
 return CBUtil.sizeOfEnumValue(change)
+ CBUtil.sizeOfEnumValue(target)
+ CBUtil.sizeOfString(keyspace)

[1/8] cassandra git commit: Fix typo

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 487c8f79d -> cfc398e81
  refs/heads/cassandra-3.0 d87921c56 -> 5d37fc4c4
  refs/heads/trunk 75177696d -> ac902a505


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/487c8f79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/487c8f79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/487c8f79

Branch: refs/heads/trunk
Commit: 487c8f79de0a8cdd357e1cd23e03783db1623c54
Parents: ec1772a
Author: T Jake Luciani 
Authored: Tue Apr 26 12:49:23 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:49:23 2016 -0400

--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/487c8f79/src/java/org/apache/cassandra/utils/Interval.java
--
diff --git a/src/java/org/apache/cassandra/utils/Interval.java 
b/src/java/org/apache/cassandra/utils/Interval.java
index b96a3d7..335ef27 100644
--- a/src/java/org/apache/cassandra/utils/Interval.java
+++ b/src/java/org/apache/cassandra/utils/Interval.java
@@ -39,7 +39,7 @@ public class Interval
 return create(min, max, null);
 }
 
-public static  Interval git gitcreate(C min, C max, D data)
+public static  Interval create(C min, C max, D data)
 {
 return new Interval(min, max, data);
 }

[2/3] cassandra git commit: Fix typo

[jake]

Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/487c8f79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/487c8f79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/487c8f79

Branch: refs/heads/cassandra-3.0
Commit: 487c8f79de0a8cdd357e1cd23e03783db1623c54
Parents: ec1772a
Author: T Jake Luciani 
Authored: Tue Apr 26 12:49:23 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:49:23 2016 -0400

--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/487c8f79/src/java/org/apache/cassandra/utils/Interval.java
--
diff --git a/src/java/org/apache/cassandra/utils/Interval.java 
b/src/java/org/apache/cassandra/utils/Interval.java
index b96a3d7..335ef27 100644
--- a/src/java/org/apache/cassandra/utils/Interval.java
+++ b/src/java/org/apache/cassandra/utils/Interval.java
@@ -39,7 +39,7 @@ public class Interval
 return create(min, max, null);
 }
 
-public static  Interval git gitcreate(C min, C max, D data)
+public static  Interval create(C min, C max, D data)
 {
 return new Interval(min, max, data);
 }

[1/3] cassandra git commit: Fix typo

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 ec1772ad8 -> 487c8f79d
  refs/heads/cassandra-3.0 8d69cabd5 -> d87921c56


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/487c8f79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/487c8f79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/487c8f79

Branch: refs/heads/cassandra-2.2
Commit: 487c8f79de0a8cdd357e1cd23e03783db1623c54
Parents: ec1772a
Author: T Jake Luciani 
Authored: Tue Apr 26 12:49:23 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Apr 26 12:49:23 2016 -0400

--
 src/java/org/apache/cassandra/utils/Interval.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/487c8f79/src/java/org/apache/cassandra/utils/Interval.java
--
diff --git a/src/java/org/apache/cassandra/utils/Interval.java 
b/src/java/org/apache/cassandra/utils/Interval.java
index b96a3d7..335ef27 100644
--- a/src/java/org/apache/cassandra/utils/Interval.java
+++ b/src/java/org/apache/cassandra/utils/Interval.java
@@ -39,7 +39,7 @@ public class Interval
 return create(min, max, null);
 }
 
-public static  Interval git gitcreate(C min, C max, D data)
+public static  Interval create(C min, C max, D data)
 {
 return new Interval(min, max, data);
 }

[2/6] cassandra git commit: Fix typo in javadoc

[slebresne]

Fix typo in javadoc


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12b6c0a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12b6c0a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12b6c0a5

Branch: refs/heads/cassandra-3.3
Commit: 12b6c0a5264138a6f569e5e957362ddaf1a4a0be
Parents: 3e45fa1
Author: Sylvain Lebresne 
Authored: Wed Jan 6 10:44:22 2016 +0100
Committer: Sylvain Lebresne 
Committed: Wed Jan 6 10:44:22 2016 +0100

--
 src/java/org/apache/cassandra/db/rows/Row.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/12b6c0a5/src/java/org/apache/cassandra/db/rows/Row.java
--
diff --git a/src/java/org/apache/cassandra/db/rows/Row.java 
b/src/java/org/apache/cassandra/db/rows/Row.java
index 8a67e9b..5f79a66 100644
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@ -394,11 +394,11 @@ public interface Row extends Unfiltered, 
Collection
 public Clustering clustering();
 
 /**
- * Adds the liveness information for the partition key columns of this 
row.
+ * Adds the liveness information for the primary key columns of this 
row.
  *
  * This call is optional (skipping it is equivalent to calling {@code 
addPartitionKeyLivenessInfo(LivenessInfo.NONE)}).
  *
- * @param info the liveness information for the partition key columns 
of the built row.
+ * @param info the liveness information for the primary key columns of 
the built row.
  */
 public void addPrimaryKeyLivenessInfo(LivenessInfo info);
 

[1/6] cassandra git commit: Fix typo in javadoc

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 3e45fa1ab -> 12b6c0a52
  refs/heads/cassandra-3.3 bd2785e9c -> 10c1e65db
  refs/heads/trunk 650d76d71 -> cfe31c3b9


Fix typo in javadoc


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12b6c0a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12b6c0a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12b6c0a5

Branch: refs/heads/cassandra-3.0
Commit: 12b6c0a5264138a6f569e5e957362ddaf1a4a0be
Parents: 3e45fa1
Author: Sylvain Lebresne 
Authored: Wed Jan 6 10:44:22 2016 +0100
Committer: Sylvain Lebresne 
Committed: Wed Jan 6 10:44:22 2016 +0100

--
 src/java/org/apache/cassandra/db/rows/Row.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/12b6c0a5/src/java/org/apache/cassandra/db/rows/Row.java
--
diff --git a/src/java/org/apache/cassandra/db/rows/Row.java 
b/src/java/org/apache/cassandra/db/rows/Row.java
index 8a67e9b..5f79a66 100644
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@ -394,11 +394,11 @@ public interface Row extends Unfiltered, 
Collection
 public Clustering clustering();
 
 /**
- * Adds the liveness information for the partition key columns of this 
row.
+ * Adds the liveness information for the primary key columns of this 
row.
  *
  * This call is optional (skipping it is equivalent to calling {@code 
addPartitionKeyLivenessInfo(LivenessInfo.NONE)}).
  *
- * @param info the liveness information for the partition key columns 
of the built row.
+ * @param info the liveness information for the primary key columns of 
the built row.
  */
 public void addPrimaryKeyLivenessInfo(LivenessInfo info);
 

[3/6] cassandra git commit: Fix typo in javadoc

[slebresne]

Fix typo in javadoc


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12b6c0a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12b6c0a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12b6c0a5

Branch: refs/heads/trunk
Commit: 12b6c0a5264138a6f569e5e957362ddaf1a4a0be
Parents: 3e45fa1
Author: Sylvain Lebresne 
Authored: Wed Jan 6 10:44:22 2016 +0100
Committer: Sylvain Lebresne 
Committed: Wed Jan 6 10:44:22 2016 +0100

--
 src/java/org/apache/cassandra/db/rows/Row.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/12b6c0a5/src/java/org/apache/cassandra/db/rows/Row.java
--
diff --git a/src/java/org/apache/cassandra/db/rows/Row.java 
b/src/java/org/apache/cassandra/db/rows/Row.java
index 8a67e9b..5f79a66 100644
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@ -394,11 +394,11 @@ public interface Row extends Unfiltered, 
Collection
 public Clustering clustering();
 
 /**
- * Adds the liveness information for the partition key columns of this 
row.
+ * Adds the liveness information for the primary key columns of this 
row.
  *
  * This call is optional (skipping it is equivalent to calling {@code 
addPartitionKeyLivenessInfo(LivenessInfo.NONE)}).
  *
- * @param info the liveness information for the partition key columns 
of the built row.
+ * @param info the liveness information for the primary key columns of 
the built row.
  */
 public void addPrimaryKeyLivenessInfo(LivenessInfo info);
 

cassandra git commit: Fix typo in cassandra.yaml

[snazy]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 d2f243ee5 -> 4e4832427


Fix typo in cassandra.yaml

patch by Hobin Yoon; reviewed by Robert Stupp for CASSANDRA-10705


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e483242
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e483242
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e483242

Branch: refs/heads/cassandra-2.2
Commit: 4e4832427afee2d2652d37d3db3ff3b3c80e4ee9
Parents: d2f243e
Author: Hobin Yoon 
Authored: Thu Nov 19 10:41:26 2015 +0100
Committer: Robert Stupp 
Committed: Thu Nov 19 10:41:26 2015 +0100

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e483242/conf/cassandra.yaml
--
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index aab8fd4..dc4ef32 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -328,7 +328,7 @@ concurrent_counter_writes: 32
 # memtable_offheap_space_in_mb: 2048
 
 # Ratio of occupied non-flushing memtable size to total permitted size
-# that will trigger a flush of the largest memtable.  Lager mct will
+# that will trigger a flush of the largest memtable. Larger mct will
 # mean larger flushes and hence less compaction, but also less concurrent
 # flush activity which can make it difficult to keep your disks fed
 # under heavy write load.

[1/4] cassandra git commit: Fix typo in cassandra.yaml

[snazy]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 8c511cc45 -> c4a54978c


Fix typo in cassandra.yaml

patch by Hobin Yoon; reviewed by Robert Stupp for CASSANDRA-10705


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e483242
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e483242
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e483242

Branch: refs/heads/trunk
Commit: 4e4832427afee2d2652d37d3db3ff3b3c80e4ee9
Parents: d2f243e
Author: Hobin Yoon 
Authored: Thu Nov 19 10:41:26 2015 +0100
Committer: Robert Stupp 
Committed: Thu Nov 19 10:41:26 2015 +0100

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e483242/conf/cassandra.yaml
--
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index aab8fd4..dc4ef32 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -328,7 +328,7 @@ concurrent_counter_writes: 32
 # memtable_offheap_space_in_mb: 2048
 
 # Ratio of occupied non-flushing memtable size to total permitted size
-# that will trigger a flush of the largest memtable.  Lager mct will
+# that will trigger a flush of the largest memtable. Larger mct will
 # mean larger flushes and hence less compaction, but also less concurrent
 # flush activity which can make it difficult to keep your disks fed
 # under heavy write load.

[1/3] cassandra git commit: Fix typo in cassandra.yaml

[snazy]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.1 7c68abcd8 -> d1103f5ab


Fix typo in cassandra.yaml

patch by Hobin Yoon; reviewed by Robert Stupp for CASSANDRA-10705


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e483242
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e483242
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e483242

Branch: refs/heads/cassandra-3.1
Commit: 4e4832427afee2d2652d37d3db3ff3b3c80e4ee9
Parents: d2f243e
Author: Hobin Yoon 
Authored: Thu Nov 19 10:41:26 2015 +0100
Committer: Robert Stupp 
Committed: Thu Nov 19 10:41:26 2015 +0100

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e483242/conf/cassandra.yaml
--
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index aab8fd4..dc4ef32 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -328,7 +328,7 @@ concurrent_counter_writes: 32
 # memtable_offheap_space_in_mb: 2048
 
 # Ratio of occupied non-flushing memtable size to total permitted size
-# that will trigger a flush of the largest memtable.  Lager mct will
+# that will trigger a flush of the largest memtable. Larger mct will
 # mean larger flushes and hence less compaction, but also less concurrent
 # flush activity which can make it difficult to keep your disks fed
 # under heavy write load.

[1/2] cassandra git commit: Fix typo in cassandra.yaml

[snazy]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 74070ee4a -> 46da70e1f


Fix typo in cassandra.yaml

patch by Hobin Yoon; reviewed by Robert Stupp for CASSANDRA-10705


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e483242
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e483242
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e483242

Branch: refs/heads/cassandra-3.0
Commit: 4e4832427afee2d2652d37d3db3ff3b3c80e4ee9
Parents: d2f243e
Author: Hobin Yoon 
Authored: Thu Nov 19 10:41:26 2015 +0100
Committer: Robert Stupp 
Committed: Thu Nov 19 10:41:26 2015 +0100

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e483242/conf/cassandra.yaml
--
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index aab8fd4..dc4ef32 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -328,7 +328,7 @@ concurrent_counter_writes: 32
 # memtable_offheap_space_in_mb: 2048
 
 # Ratio of occupied non-flushing memtable size to total permitted size
-# that will trigger a flush of the largest memtable.  Lager mct will
+# that will trigger a flush of the largest memtable. Larger mct will
 # mean larger flushes and hence less compaction, but also less concurrent
 # flush activity which can make it difficult to keep your disks fed
 # under heavy write load.

[1/5] cassandra git commit: Fix typo in ticket number

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/trunk f7a19b3e5 -> 05eb6022c


Fix typo in ticket number


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2c4d4e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2c4d4e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2c4d4e4

Branch: refs/heads/trunk
Commit: a2c4d4e4888dbfb434189c05fc58c7298e1dd7ff
Parents: 9d8436f
Author: Sylvain Lebresne 
Authored: Wed Oct 21 14:31:59 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Oct 21 14:31:59 2015 +0200

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2c4d4e4/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 31ae1c0..d06345e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
 2.1.12
- * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-8821)
+ * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-10251)
  * Fix potential NPE from handling result of SIM.highestSelectivityIndex 
(CASSANDRA-10550)
  * Fix paging issues with partitions containing only static columns data
(CASSANDRA-10381)

cassandra git commit: Fix typo in ticket number

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 9d8436f92 -> a2c4d4e48


Fix typo in ticket number


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2c4d4e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2c4d4e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2c4d4e4

Branch: refs/heads/cassandra-2.1
Commit: a2c4d4e4888dbfb434189c05fc58c7298e1dd7ff
Parents: 9d8436f
Author: Sylvain Lebresne 
Authored: Wed Oct 21 14:31:59 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Oct 21 14:31:59 2015 +0200

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2c4d4e4/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 31ae1c0..d06345e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
 2.1.12
- * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-8821)
+ * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-10251)
  * Fix potential NPE from handling result of SIM.highestSelectivityIndex 
(CASSANDRA-10550)
  * Fix paging issues with partitions containing only static columns data
(CASSANDRA-10381)

[1/3] cassandra git commit: Fix typo in ticket number

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 8be382a7e -> c9413211c


Fix typo in ticket number


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2c4d4e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2c4d4e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2c4d4e4

Branch: refs/heads/cassandra-3.0
Commit: a2c4d4e4888dbfb434189c05fc58c7298e1dd7ff
Parents: 9d8436f
Author: Sylvain Lebresne 
Authored: Wed Oct 21 14:31:59 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Oct 21 14:31:59 2015 +0200

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2c4d4e4/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 31ae1c0..d06345e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
 2.1.12
- * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-8821)
+ * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-10251)
  * Fix potential NPE from handling result of SIM.highestSelectivityIndex 
(CASSANDRA-10550)
  * Fix paging issues with partitions containing only static columns data
(CASSANDRA-10381)

[1/2] cassandra git commit: Fix typo in ticket number

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 d3085b1ba -> 20d550861


Fix typo in ticket number


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2c4d4e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2c4d4e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2c4d4e4

Branch: refs/heads/cassandra-2.2
Commit: a2c4d4e4888dbfb434189c05fc58c7298e1dd7ff
Parents: 9d8436f
Author: Sylvain Lebresne 
Authored: Wed Oct 21 14:31:59 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Oct 21 14:31:59 2015 +0200

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2c4d4e4/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 31ae1c0..d06345e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
 2.1.12
- * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-8821)
+ * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-10251)
  * Fix potential NPE from handling result of SIM.highestSelectivityIndex 
(CASSANDRA-10550)
  * Fix paging issues with partitions containing only static columns data
(CASSANDRA-10381)

cassandra git commit: Fix typo

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 782a1c3ae -> 704bf1e56


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/704bf1e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/704bf1e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/704bf1e5

Branch: refs/heads/cassandra-3.0
Commit: 704bf1e56bb9212cf2e98b70048478e97bd0f80c
Parents: 782a1c3
Author: Sylvain Lebresne 
Authored: Tue Sep 1 10:54:32 2015 +0200
Committer: Sylvain Lebresne 
Committed: Tue Sep 1 10:54:32 2015 +0200

--
 src/java/org/apache/cassandra/cql3/UpdateParameters.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/704bf1e5/src/java/org/apache/cassandra/cql3/UpdateParameters.java
--
diff --git a/src/java/org/apache/cassandra/cql3/UpdateParameters.java 
b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
index 045b1e1..22aeddd 100644
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@ -149,7 +149,7 @@ public class UpdateParameters
 // For compact tables, at the exclusion of the static row (of static 
compact tables), each row ever has a single column,
 // the "compact" one. As such, deleting the row or deleting that 
single cell is equivalent. We favor the later however
 // because that makes it easier when translating back to the old 
format layout (for thrift and pre-3.0 backward
-// compatibility) as we don't have to special case for the row 
deletion. This is also in line with what we use to do pre-3.0.
+// compatibility) as we don't have to special case for the row 
deletion. This is also in line with what we used to do pre-3.0.
 if (metadata.isCompactTable() && builder.clustering() != 
Clustering.STATIC_CLUSTERING)
 addTombstone(metadata.compactValueColumn());
 else

[1/4] cassandra git commit: Fix typo

[benedict]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 704bf1e56 -> 07594ee05
  refs/heads/trunk 4e57b8200 -> c2ee6bac3


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/704bf1e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/704bf1e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/704bf1e5

Branch: refs/heads/trunk
Commit: 704bf1e56bb9212cf2e98b70048478e97bd0f80c
Parents: 782a1c3
Author: Sylvain Lebresne 
Authored: Tue Sep 1 10:54:32 2015 +0200
Committer: Sylvain Lebresne 
Committed: Tue Sep 1 10:54:32 2015 +0200

--
 src/java/org/apache/cassandra/cql3/UpdateParameters.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/704bf1e5/src/java/org/apache/cassandra/cql3/UpdateParameters.java
--
diff --git a/src/java/org/apache/cassandra/cql3/UpdateParameters.java 
b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
index 045b1e1..22aeddd 100644
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@ -149,7 +149,7 @@ public class UpdateParameters
 // For compact tables, at the exclusion of the static row (of static 
compact tables), each row ever has a single column,
 // the "compact" one. As such, deleting the row or deleting that 
single cell is equivalent. We favor the later however
 // because that makes it easier when translating back to the old 
format layout (for thrift and pre-3.0 backward
-// compatibility) as we don't have to special case for the row 
deletion. This is also in line with what we use to do pre-3.0.
+// compatibility) as we don't have to special case for the row 
deletion. This is also in line with what we used to do pre-3.0.
 if (metadata.isCompactTable() && builder.clustering() != 
Clustering.STATIC_CLUSTERING)
 addTombstone(metadata.compactValueColumn());
 else

[1/2] cassandra git commit: Fix typo

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 891d6436c - 020ba08b8


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5c14285
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5c14285
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5c14285

Branch: refs/heads/trunk
Commit: e5c14285404b1ba98d385c5e5ed069229a2f6004
Parents: fcdf191
Author: T Jake Luciani j...@apache.org
Authored: Fri Aug 28 11:32:53 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Fri Aug 28 11:32:53 2015 -0400

--
 src/java/org/apache/cassandra/db/view/MaterializedViewManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5c14285/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
--
diff --git a/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java 
b/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
index 6c108a2..e0cecf5 100644
--- a/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
@@ -59,7 +59,7 @@ import org.apache.cassandra.service.StorageService;
 public class MaterializedViewManager
 {
 private static final StripedLock LOCKS = 
Striped.lazyWeakLock(DatabaseDescriptor.getConcurrentWriters() * 1024);
-private static final boolean disableCoordinatorBatchlog = 
Boolean.getBoolean(cassandra.mv_disble_coordinator_batchlog);
+private static final boolean disableCoordinatorBatchlog = 
Boolean.getBoolean(cassandra.mv_disable_coordinator_batchlog);
 
 private final ConcurrentNavigableMapString, MaterializedView viewsByName;
 

cassandra git commit: Fix typo

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 fcdf191f5 - e5c142854


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5c14285
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5c14285
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5c14285

Branch: refs/heads/cassandra-3.0
Commit: e5c14285404b1ba98d385c5e5ed069229a2f6004
Parents: fcdf191
Author: T Jake Luciani j...@apache.org
Authored: Fri Aug 28 11:32:53 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Fri Aug 28 11:32:53 2015 -0400

--
 src/java/org/apache/cassandra/db/view/MaterializedViewManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5c14285/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
--
diff --git a/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java 
b/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
index 6c108a2..e0cecf5 100644
--- a/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
+++ b/src/java/org/apache/cassandra/db/view/MaterializedViewManager.java
@@ -59,7 +59,7 @@ import org.apache.cassandra.service.StorageService;
 public class MaterializedViewManager
 {
 private static final StripedLock LOCKS = 
Striped.lazyWeakLock(DatabaseDescriptor.getConcurrentWriters() * 1024);
-private static final boolean disableCoordinatorBatchlog = 
Boolean.getBoolean(cassandra.mv_disble_coordinator_batchlog);
+private static final boolean disableCoordinatorBatchlog = 
Boolean.getBoolean(cassandra.mv_disable_coordinator_batchlog);
 
 private final ConcurrentNavigableMapString, MaterializedView viewsByName;
 

[2/5] cassandra git commit: Fix typo in NEWS message

[benedict]

Fix typo in NEWS message


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6cbc436
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6cbc436
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6cbc436

Branch: refs/heads/trunk
Commit: c6cbc436b2d94eab21c00f5dbb74f0d8a3dcb46b
Parents: ec50348
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 17 10:42:26 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 17 10:42:26 2015 +0200

--
 NEWS.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6cbc436/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index 3ba7efa..ef764ad 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -65,7 +65,7 @@ Upgrading
- Only map syntax is now allowed for caching options. 
ALL/NONE/KEYS_ONLY/ROWS_ONLY syntax
  has been deprecated since 2.1.0 and is being removed in 3.0.0.
- The 'index_interval' option for 'CREATE TABLE' statements, which has been 
deprecated
- since 2.0 and replaced with the 'min_index_interval' and 
'max_index_interval' options,
+ since 2.1 and replaced with the 'min_index_interval' and 
'max_index_interval' options,
  has now been removed.
- Batchlog entries are now stored in a new table - system.batches.
  The old one has been deprecated.

cassandra git commit: Fix typo in NEWS message

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 ec50348d3 - c6cbc436b


Fix typo in NEWS message


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6cbc436
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6cbc436
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6cbc436

Branch: refs/heads/cassandra-3.0
Commit: c6cbc436b2d94eab21c00f5dbb74f0d8a3dcb46b
Parents: ec50348
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 17 10:42:26 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 17 10:42:26 2015 +0200

--
 NEWS.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6cbc436/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index 3ba7efa..ef764ad 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -65,7 +65,7 @@ Upgrading
- Only map syntax is now allowed for caching options. 
ALL/NONE/KEYS_ONLY/ROWS_ONLY syntax
  has been deprecated since 2.1.0 and is being removed in 3.0.0.
- The 'index_interval' option for 'CREATE TABLE' statements, which has been 
deprecated
- since 2.0 and replaced with the 'min_index_interval' and 
'max_index_interval' options,
+ since 2.1 and replaced with the 'min_index_interval' and 
'max_index_interval' options,
  has now been removed.
- Batchlog entries are now stored in a new table - system.batches.
  The old one has been deprecated.

[1/3] cassandra git commit: Fix typo in CREATE TABLE error message

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 793bf45fb - c41412a7f


Fix typo in CREATE TABLE error message

patch by sehrope; reviewed by slebresne for CASSANDRA-10087


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f287c46
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f287c46
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f287c46

Branch: refs/heads/trunk
Commit: 0f287c46fc87032c82bd53be11a13f2780b35593
Parents: c645b11
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Sun Aug 16 12:15:20 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Sun Aug 16 12:15:20 2015 +0200

--
 .../org/apache/cassandra/cql3/statements/CreateTableStatement.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f287c46/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
index b3591a2..7810a8a 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
@@ -221,7 +221,7 @@ public class CreateTableStatement extends 
SchemaAlteringStatement
 {
 // Column family name
 if (!columnFamily().matches(\\w+))
-throw new InvalidRequestException(String.format(\%s\ is not 
a valid table name (must be alphanumeric character only: [0-9A-Za-z]+), 
columnFamily()));
+throw new InvalidRequestException(String.format(\%s\ is not 
a valid table name (must be alphanumeric character or underscore only: 
[a-zA-Z_0-9]+), columnFamily()));
 if (columnFamily().length()  Schema.NAME_LENGTH)
 throw new InvalidRequestException(String.format(Table names 
shouldn't be more than %s characters long (got \%s\), Schema.NAME_LENGTH, 
columnFamily()));
 

cassandra git commit: Fix typo in CREATE TABLE error message

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 c645b1193 - 0f287c46f


Fix typo in CREATE TABLE error message

patch by sehrope; reviewed by slebresne for CASSANDRA-10087


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f287c46
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f287c46
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f287c46

Branch: refs/heads/cassandra-2.2
Commit: 0f287c46fc87032c82bd53be11a13f2780b35593
Parents: c645b11
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Sun Aug 16 12:15:20 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Sun Aug 16 12:15:20 2015 +0200

--
 .../org/apache/cassandra/cql3/statements/CreateTableStatement.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f287c46/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
index b3591a2..7810a8a 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
@@ -221,7 +221,7 @@ public class CreateTableStatement extends 
SchemaAlteringStatement
 {
 // Column family name
 if (!columnFamily().matches(\\w+))
-throw new InvalidRequestException(String.format(\%s\ is not 
a valid table name (must be alphanumeric character only: [0-9A-Za-z]+), 
columnFamily()));
+throw new InvalidRequestException(String.format(\%s\ is not 
a valid table name (must be alphanumeric character or underscore only: 
[a-zA-Z_0-9]+), columnFamily()));
 if (columnFamily().length()  Schema.NAME_LENGTH)
 throw new InvalidRequestException(String.format(Table names 
shouldn't be more than %s characters long (got \%s\), Schema.NAME_LENGTH, 
columnFamily()));
 

[1/2] cassandra git commit: Fix typo in CREATE TABLE error message

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 da8d48a79 - fb28cb7b6


Fix typo in CREATE TABLE error message

patch by sehrope; reviewed by slebresne for CASSANDRA-10087


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f287c46
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f287c46
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f287c46

Branch: refs/heads/cassandra-3.0
Commit: 0f287c46fc87032c82bd53be11a13f2780b35593
Parents: c645b11
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Sun Aug 16 12:15:20 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Sun Aug 16 12:15:20 2015 +0200

--
 .../org/apache/cassandra/cql3/statements/CreateTableStatement.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f287c46/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
--
diff --git 
a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java 
b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
index b3591a2..7810a8a 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
@@ -221,7 +221,7 @@ public class CreateTableStatement extends 
SchemaAlteringStatement
 {
 // Column family name
 if (!columnFamily().matches(\\w+))
-throw new InvalidRequestException(String.format(\%s\ is not 
a valid table name (must be alphanumeric character only: [0-9A-Za-z]+), 
columnFamily()));
+throw new InvalidRequestException(String.format(\%s\ is not 
a valid table name (must be alphanumeric character or underscore only: 
[a-zA-Z_0-9]+), columnFamily()));
 if (columnFamily().length()  Schema.NAME_LENGTH)
 throw new InvalidRequestException(String.format(Table names 
shouldn't be more than %s characters long (got \%s\), Schema.NAME_LENGTH, 
columnFamily()));
 

[1/2] cassandra git commit: fix typo

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/trunk ce3053a23 - 850b5d0d2


fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86b04ad0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86b04ad0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86b04ad0

Branch: refs/heads/trunk
Commit: 86b04ad0d4682bc49bd294d4d598d131f4da1158
Parents: e8276aa
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Thu Mar 19 21:12:25 2015 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Thu Mar 19 21:12:25 2015 -0400

--
 src/java/org/apache/cassandra/dht/AbstractBounds.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/86b04ad0/src/java/org/apache/cassandra/dht/AbstractBounds.java
--
diff --git a/src/java/org/apache/cassandra/dht/AbstractBounds.java 
b/src/java/org/apache/cassandra/dht/AbstractBounds.java
index 6d2ee43..704d8c2 100644
--- a/src/java/org/apache/cassandra/dht/AbstractBounds.java
+++ b/src/java/org/apache/cassandra/dht/AbstractBounds.java
@@ -261,7 +261,7 @@ public abstract class AbstractBoundsT extends 
RingPositionT implements Seria
 
 public static T extends RingPositionT BoundaryT maxLeft(BoundaryT 
left1, BoundaryT left2)
 {
-int c = left1.boundary.compareTo(left1.boundary);
+int c = left1.boundary.compareTo(left2.boundary);
 if (c != 0)
 return c  0 ? left1 : left2;
 // return the exclusive version, if either

cassandra git commit: fix typo

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 e8276aa53 - 86b04ad0d


fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86b04ad0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86b04ad0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86b04ad0

Branch: refs/heads/cassandra-2.1
Commit: 86b04ad0d4682bc49bd294d4d598d131f4da1158
Parents: e8276aa
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Thu Mar 19 21:12:25 2015 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Thu Mar 19 21:12:25 2015 -0400

--
 src/java/org/apache/cassandra/dht/AbstractBounds.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/86b04ad0/src/java/org/apache/cassandra/dht/AbstractBounds.java
--
diff --git a/src/java/org/apache/cassandra/dht/AbstractBounds.java 
b/src/java/org/apache/cassandra/dht/AbstractBounds.java
index 6d2ee43..704d8c2 100644
--- a/src/java/org/apache/cassandra/dht/AbstractBounds.java
+++ b/src/java/org/apache/cassandra/dht/AbstractBounds.java
@@ -261,7 +261,7 @@ public abstract class AbstractBoundsT extends 
RingPositionT implements Seria
 
 public static T extends RingPositionT BoundaryT maxLeft(BoundaryT 
left1, BoundaryT left2)
 {
-int c = left1.boundary.compareTo(left1.boundary);
+int c = left1.boundary.compareTo(left2.boundary);
 if (c != 0)
 return c  0 ? left1 : left2;
 // return the exclusive version, if either

[1/2] cassandra git commit: fix typo causing bad format string marker

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 8c5a959c9 - 818ec3310


fix typo causing bad format string marker


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed54e808
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed54e808
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed54e808

Branch: refs/heads/cassandra-2.1
Commit: ed54e80855a37f88a8625e1ecf9ce574f0d4081d
Parents: e750ab2
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri Jan 9 00:27:47 2015 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri Jan 9 00:27:47 2015 -0500

--
 .../db/compaction/DateTieredCompactionStrategyTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed54e808/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
index 299e1af..84230da 100644
--- 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
@@ -70,7 +70,7 @@ public class DateTieredCompactionStrategyTest extends 
SchemaLoader
 {
 options.put(DateTieredCompactionStrategyOptions.BASE_TIME_KEY, 
-1337);
 validateOptions(options);
-fail(String.format(%Negative %s should be rejected, 
DateTieredCompactionStrategyOptions.BASE_TIME_KEY));
+fail(String.format(Negative %s should be rejected, 
DateTieredCompactionStrategyOptions.BASE_TIME_KEY));
 }
 catch (ConfigurationException e)
 {
@@ -81,7 +81,7 @@ public class DateTieredCompactionStrategyTest extends 
SchemaLoader
 {
 
options.put(DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY, -1337);
 validateOptions(options);
-fail(String.format(%Negative %s should be rejected, 
DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY));
+fail(String.format(Negative %s should be rejected, 
DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY));
 }
 catch (ConfigurationException e)
 {

cassandra git commit: fix typo causing bad format string marker

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 e750ab238 - ed54e8085


fix typo causing bad format string marker


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed54e808
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed54e808
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed54e808

Branch: refs/heads/cassandra-2.0
Commit: ed54e80855a37f88a8625e1ecf9ce574f0d4081d
Parents: e750ab2
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri Jan 9 00:27:47 2015 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri Jan 9 00:27:47 2015 -0500

--
 .../db/compaction/DateTieredCompactionStrategyTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed54e808/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
index 299e1af..84230da 100644
--- 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
@@ -70,7 +70,7 @@ public class DateTieredCompactionStrategyTest extends 
SchemaLoader
 {
 options.put(DateTieredCompactionStrategyOptions.BASE_TIME_KEY, 
-1337);
 validateOptions(options);
-fail(String.format(%Negative %s should be rejected, 
DateTieredCompactionStrategyOptions.BASE_TIME_KEY));
+fail(String.format(Negative %s should be rejected, 
DateTieredCompactionStrategyOptions.BASE_TIME_KEY));
 }
 catch (ConfigurationException e)
 {
@@ -81,7 +81,7 @@ public class DateTieredCompactionStrategyTest extends 
SchemaLoader
 {
 
options.put(DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY, -1337);
 validateOptions(options);
-fail(String.format(%Negative %s should be rejected, 
DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY));
+fail(String.format(Negative %s should be rejected, 
DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY));
 }
 catch (ConfigurationException e)
 {

[1/3] cassandra git commit: fix typo causing bad format string marker

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 2fc3a8934 - dde4d8293


fix typo causing bad format string marker


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed54e808
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed54e808
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed54e808

Branch: refs/heads/trunk
Commit: ed54e80855a37f88a8625e1ecf9ce574f0d4081d
Parents: e750ab2
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri Jan 9 00:27:47 2015 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri Jan 9 00:27:47 2015 -0500

--
 .../db/compaction/DateTieredCompactionStrategyTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed54e808/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
index 299e1af..84230da 100644
--- 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
@@ -70,7 +70,7 @@ public class DateTieredCompactionStrategyTest extends 
SchemaLoader
 {
 options.put(DateTieredCompactionStrategyOptions.BASE_TIME_KEY, 
-1337);
 validateOptions(options);
-fail(String.format(%Negative %s should be rejected, 
DateTieredCompactionStrategyOptions.BASE_TIME_KEY));
+fail(String.format(Negative %s should be rejected, 
DateTieredCompactionStrategyOptions.BASE_TIME_KEY));
 }
 catch (ConfigurationException e)
 {
@@ -81,7 +81,7 @@ public class DateTieredCompactionStrategyTest extends 
SchemaLoader
 {
 
options.put(DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY, -1337);
 validateOptions(options);
-fail(String.format(%Negative %s should be rejected, 
DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY));
+fail(String.format(Negative %s should be rejected, 
DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY));
 }
 catch (ConfigurationException e)
 {

git commit: Fix typo in cqlsh insert documentation

[tylerhobbs]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 62386f13e - ef14f5165


Fix typo in cqlsh insert documentation

Patch by Ricardo Devis Agullo; reviewed by Tyler Hobbs for
CASSANDRA-4959


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef14f516
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef14f516
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef14f516

Branch: refs/heads/cassandra-2.0
Commit: ef14f5165568e5f0ef0feed23b1f829b013995be
Parents: 62386f1
Author: Ricardo Devis Agullo rde...@deusto.es
Authored: Fri Oct 31 14:15:50 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Oct 31 14:15:50 2014 -0500

--
 pylib/cqlshlib/helptopics.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef14f516/pylib/cqlshlib/helptopics.py
--
diff --git a/pylib/cqlshlib/helptopics.py b/pylib/cqlshlib/helptopics.py
index 710aa74..2af8db2 100644
--- a/pylib/cqlshlib/helptopics.py
+++ b/pylib/cqlshlib/helptopics.py
@@ -608,7 +608,7 @@ class CQL3HelpTopics(CQLHelpTopics):
 ( colname1, colname2 [, colname3 [, ...]] )
VALUES ( colval1, colval2 [, colval3 [, ...]] )
[USING TIMESTAMP timestamp]
- [AND TTL timeToLive]];
+ [AND TTL timeToLive];
 
 An INSERT is used to write one or more columns to a record in a
 CQL table. No results are returned.

[1/2] git commit: Fix typo in cqlsh insert documentation

[tylerhobbs]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 a29ee07e3 - d2309227c


Fix typo in cqlsh insert documentation

Patch by Ricardo Devis Agullo; reviewed by Tyler Hobbs for
CASSANDRA-4959


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef14f516
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef14f516
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef14f516

Branch: refs/heads/cassandra-2.1
Commit: ef14f5165568e5f0ef0feed23b1f829b013995be
Parents: 62386f1
Author: Ricardo Devis Agullo rde...@deusto.es
Authored: Fri Oct 31 14:15:50 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Oct 31 14:15:50 2014 -0500

--
 pylib/cqlshlib/helptopics.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef14f516/pylib/cqlshlib/helptopics.py
--
diff --git a/pylib/cqlshlib/helptopics.py b/pylib/cqlshlib/helptopics.py
index 710aa74..2af8db2 100644
--- a/pylib/cqlshlib/helptopics.py
+++ b/pylib/cqlshlib/helptopics.py
@@ -608,7 +608,7 @@ class CQL3HelpTopics(CQLHelpTopics):
 ( colname1, colname2 [, colname3 [, ...]] )
VALUES ( colval1, colval2 [, colval3 [, ...]] )
[USING TIMESTAMP timestamp]
- [AND TTL timeToLive]];
+ [AND TTL timeToLive];
 
 An INSERT is used to write one or more columns to a record in a
 CQL table. No results are returned.

[1/3] git commit: Fix typo in cqlsh insert documentation

[tylerhobbs]

Repository: cassandra
Updated Branches:
  refs/heads/trunk ba581f40f - 9274197b4


Fix typo in cqlsh insert documentation

Patch by Ricardo Devis Agullo; reviewed by Tyler Hobbs for
CASSANDRA-4959


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef14f516
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef14f516
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef14f516

Branch: refs/heads/trunk
Commit: ef14f5165568e5f0ef0feed23b1f829b013995be
Parents: 62386f1
Author: Ricardo Devis Agullo rde...@deusto.es
Authored: Fri Oct 31 14:15:50 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Oct 31 14:15:50 2014 -0500

--
 pylib/cqlshlib/helptopics.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef14f516/pylib/cqlshlib/helptopics.py
--
diff --git a/pylib/cqlshlib/helptopics.py b/pylib/cqlshlib/helptopics.py
index 710aa74..2af8db2 100644
--- a/pylib/cqlshlib/helptopics.py
+++ b/pylib/cqlshlib/helptopics.py
@@ -608,7 +608,7 @@ class CQL3HelpTopics(CQLHelpTopics):
 ( colname1, colname2 [, colname3 [, ...]] )
VALUES ( colval1, colval2 [, colval3 [, ...]] )
[USING TIMESTAMP timestamp]
- [AND TTL timeToLive]];
+ [AND TTL timeToLive];
 
 An INSERT is used to write one or more columns to a record in a
 CQL table. No results are returned.

git commit: fix typo in TriggerExecutor patch by Liang Xie; reviewed by Vijay for CASSANDRA-8184

[vijay]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 7cf3f19be - 658a65b28


fix typo in TriggerExecutor
patch by Liang Xie; reviewed by Vijay for CASSANDRA-8184


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/658a65b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/658a65b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/658a65b2

Branch: refs/heads/cassandra-2.1
Commit: 658a65b281a2ce11b94eb7a60f54de02a1e85342
Parents: 7cf3f19
Author: Vijay vijay2...@gmail.com
Authored: Fri Oct 24 09:19:40 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Fri Oct 24 09:19:40 2014 -0700

--
 src/java/org/apache/cassandra/triggers/TriggerExecutor.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/658a65b2/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
--
diff --git a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java 
b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
index 001529d..677daad 100644
--- a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
+++ b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
@@ -53,10 +53,10 @@ public class TriggerExecutor
  */
 public void reloadClasses()
 {
-File tiggerDirectory = FBUtilities.cassandraTriggerDir();
-if (tiggerDirectory == null)
+File triggerDirectory = FBUtilities.cassandraTriggerDir();
+if (triggerDirectory == null)
 return;
-customClassLoader = new CustomClassLoader(parent, tiggerDirectory);
+customClassLoader = new CustomClassLoader(parent, triggerDirectory);
 cachedTriggers.clear();
 }
 

[1/2] git commit: fix typo in TriggerExecutor patch by Liang Xie; reviewed by Vijay for CASSANDRA-8184

[vijay]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 908900800 - 2976e6937


fix typo in TriggerExecutor
patch by Liang Xie; reviewed by Vijay for CASSANDRA-8184


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/658a65b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/658a65b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/658a65b2

Branch: refs/heads/trunk
Commit: 658a65b281a2ce11b94eb7a60f54de02a1e85342
Parents: 7cf3f19
Author: Vijay vijay2...@gmail.com
Authored: Fri Oct 24 09:19:40 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Fri Oct 24 09:19:40 2014 -0700

--
 src/java/org/apache/cassandra/triggers/TriggerExecutor.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/658a65b2/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
--
diff --git a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java 
b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
index 001529d..677daad 100644
--- a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
+++ b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
@@ -53,10 +53,10 @@ public class TriggerExecutor
  */
 public void reloadClasses()
 {
-File tiggerDirectory = FBUtilities.cassandraTriggerDir();
-if (tiggerDirectory == null)
+File triggerDirectory = FBUtilities.cassandraTriggerDir();
+if (triggerDirectory == null)
 return;
-customClassLoader = new CustomClassLoader(parent, tiggerDirectory);
+customClassLoader = new CustomClassLoader(parent, triggerDirectory);
 cachedTriggers.clear();
 }
 

[2/6] git commit: fix typo

[yukim]

fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d96485ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d96485ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d96485ff

Branch: refs/heads/cassandra-2.1
Commit: d96485ff16d8b90173007a8d6601aba8d105b8f0
Parents: d143487
Author: Yuki Morishita yu...@apache.org
Authored: Mon Sep 22 11:12:12 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Mon Sep 22 11:12:12 2014 -0500

--
 src/java/org/apache/cassandra/service/ClientState.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d96485ff/src/java/org/apache/cassandra/service/ClientState.java
--
diff --git a/src/java/org/apache/cassandra/service/ClientState.java 
b/src/java/org/apache/cassandra/service/ClientState.java
index 38c56da..7611a14 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -148,7 +148,7 @@ public class ClientState
 public String getKeyspace() throws InvalidRequestException
 {
 if (keyspace == null)
-throw new InvalidRequestException(No keyspace has been specified. 
USE a keyspace, or explicity specify keyspace.tablename);
+throw new InvalidRequestException(No keyspace has been specified. 
USE a keyspace, or explicitly specify keyspace.tablename);
 return keyspace;
 }
 

[3/6] git commit: fix typo

[yukim]

fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d96485ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d96485ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d96485ff

Branch: refs/heads/trunk
Commit: d96485ff16d8b90173007a8d6601aba8d105b8f0
Parents: d143487
Author: Yuki Morishita yu...@apache.org
Authored: Mon Sep 22 11:12:12 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Mon Sep 22 11:12:12 2014 -0500

--
 src/java/org/apache/cassandra/service/ClientState.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d96485ff/src/java/org/apache/cassandra/service/ClientState.java
--
diff --git a/src/java/org/apache/cassandra/service/ClientState.java 
b/src/java/org/apache/cassandra/service/ClientState.java
index 38c56da..7611a14 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -148,7 +148,7 @@ public class ClientState
 public String getKeyspace() throws InvalidRequestException
 {
 if (keyspace == null)
-throw new InvalidRequestException(No keyspace has been specified. 
USE a keyspace, or explicity specify keyspace.tablename);
+throw new InvalidRequestException(No keyspace has been specified. 
USE a keyspace, or explicitly specify keyspace.tablename);
 return keyspace;
 }
 

[1/6] git commit: fix typo

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 d143487cb - d96485ff1
  refs/heads/cassandra-2.1 eecc034b6 - ce357d915
  refs/heads/trunk 776251874 - f1bd50ce5


fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d96485ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d96485ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d96485ff

Branch: refs/heads/cassandra-2.0
Commit: d96485ff16d8b90173007a8d6601aba8d105b8f0
Parents: d143487
Author: Yuki Morishita yu...@apache.org
Authored: Mon Sep 22 11:12:12 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Mon Sep 22 11:12:12 2014 -0500

--
 src/java/org/apache/cassandra/service/ClientState.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d96485ff/src/java/org/apache/cassandra/service/ClientState.java
--
diff --git a/src/java/org/apache/cassandra/service/ClientState.java 
b/src/java/org/apache/cassandra/service/ClientState.java
index 38c56da..7611a14 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -148,7 +148,7 @@ public class ClientState
 public String getKeyspace() throws InvalidRequestException
 {
 if (keyspace == null)
-throw new InvalidRequestException(No keyspace has been specified. 
USE a keyspace, or explicity specify keyspace.tablename);
+throw new InvalidRequestException(No keyspace has been specified. 
USE a keyspace, or explicitly specify keyspace.tablename);
 return keyspace;
 }
 

[3/4] git commit: Fix typo in v3 native protocol spec

[tylerhobbs]

Fix typo in v3 native protocol spec

Patch by Robert Stupp; review by Tyler Hobbs for CASSANDRA-7652


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff992442
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff992442
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff992442

Branch: refs/heads/cassandra-2.1
Commit: ff992442acd4af5ba039d433ffbedf859b4fde52
Parents: 70c72b7
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Jul 30 17:13:10 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Jul 30 17:13:10 2014 -0500

--
 doc/native_protocol_v3.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff992442/doc/native_protocol_v3.spec
--
diff --git a/doc/native_protocol_v3.spec b/doc/native_protocol_v3.spec
index c26feeb..13b6ac6 100644
--- a/doc/native_protocol_v3.spec
+++ b/doc/native_protocol_v3.spec
@@ -446,7 +446,7 @@ Table of Contents
   Indicates an error processing a request. The body of the message will be an
   error code ([int]) followed by a [string] error message. Then, depending on
   the exception, more content may follow. The error codes are defined in
-  Section 8, along with their additional content if any.
+  Section 9, along with their additional content if any.
 
 
 4.2.2. READY

git commit: Fix typo in v3 native protocol spec

[tylerhobbs]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 70c72b7ec - ff992442a


Fix typo in v3 native protocol spec

Patch by Robert Stupp; review by Tyler Hobbs for CASSANDRA-7652


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff992442
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff992442
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff992442

Branch: refs/heads/cassandra-2.1.0
Commit: ff992442acd4af5ba039d433ffbedf859b4fde52
Parents: 70c72b7
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Jul 30 17:13:10 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Jul 30 17:13:10 2014 -0500

--
 doc/native_protocol_v3.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff992442/doc/native_protocol_v3.spec
--
diff --git a/doc/native_protocol_v3.spec b/doc/native_protocol_v3.spec
index c26feeb..13b6ac6 100644
--- a/doc/native_protocol_v3.spec
+++ b/doc/native_protocol_v3.spec
@@ -446,7 +446,7 @@ Table of Contents
   Indicates an error processing a request. The body of the message will be an
   error code ([int]) followed by a [string] error message. Then, depending on
   the exception, more content may follow. The error codes are defined in
-  Section 8, along with their additional content if any.
+  Section 9, along with their additional content if any.
 
 
 4.2.2. READY

[1/3] git commit: Fix typo in v3 native protocol spec

[tylerhobbs]

Repository: cassandra
Updated Branches:
  refs/heads/trunk fec97df34 - fafcfc787


Fix typo in v3 native protocol spec

Patch by Robert Stupp; review by Tyler Hobbs for CASSANDRA-7652


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff992442
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff992442
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff992442

Branch: refs/heads/trunk
Commit: ff992442acd4af5ba039d433ffbedf859b4fde52
Parents: 70c72b7
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Jul 30 17:13:10 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Jul 30 17:13:10 2014 -0500

--
 doc/native_protocol_v3.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff992442/doc/native_protocol_v3.spec
--
diff --git a/doc/native_protocol_v3.spec b/doc/native_protocol_v3.spec
index c26feeb..13b6ac6 100644
--- a/doc/native_protocol_v3.spec
+++ b/doc/native_protocol_v3.spec
@@ -446,7 +446,7 @@ Table of Contents
   Indicates an error processing a request. The body of the message will be an
   error code ([int]) followed by a [string] error message. Then, depending on
   the exception, more content may follow. The error codes are defined in
-  Section 8, along with their additional content if any.
+  Section 9, along with their additional content if any.
 
 
 4.2.2. READY

git commit: Fix typo in CFDefinition

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 34252003b - 4c95d0848


Fix typo in CFDefinition

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7452


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c95d084
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c95d084
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c95d084

Branch: refs/heads/cassandra-2.0
Commit: 4c95d08480a88e31763da7926d379e9e4bc264a9
Parents: 3425200
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Jul 2 17:19:18 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Jul 2 17:19:18 2014 +0200

--
 src/java/org/apache/cassandra/cql3/CFDefinition.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c95d084/src/java/org/apache/cassandra/cql3/CFDefinition.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CFDefinition.java 
b/src/java/org/apache/cassandra/cql3/CFDefinition.java
index 3266c95..23bedaf 100644
--- a/src/java/org/apache/cassandra/cql3/CFDefinition.java
+++ b/src/java/org/apache/cassandra/cql3/CFDefinition.java
@@ -152,7 +152,7 @@ public class CFDefinition implements 
IterableCFDefinition.Name
 
 public CollectionName staticColumns()
 {
-return regularColumns.values();
+return staticColumns.values();
 }
 
 public Name compactValue()

[1/2] git commit: Fix typo in CFDefinition

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 f3961a63a - 29a993485


Fix typo in CFDefinition

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7452


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c95d084
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c95d084
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c95d084

Branch: refs/heads/cassandra-2.1.0
Commit: 4c95d08480a88e31763da7926d379e9e4bc264a9
Parents: 3425200
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Jul 2 17:19:18 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Jul 2 17:19:18 2014 +0200

--
 src/java/org/apache/cassandra/cql3/CFDefinition.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c95d084/src/java/org/apache/cassandra/cql3/CFDefinition.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CFDefinition.java 
b/src/java/org/apache/cassandra/cql3/CFDefinition.java
index 3266c95..23bedaf 100644
--- a/src/java/org/apache/cassandra/cql3/CFDefinition.java
+++ b/src/java/org/apache/cassandra/cql3/CFDefinition.java
@@ -152,7 +152,7 @@ public class CFDefinition implements 
IterableCFDefinition.Name
 
 public CollectionName staticColumns()
 {
-return regularColumns.values();
+return staticColumns.values();
 }
 
 public Name compactValue()

[01/10] git commit: Fix typo in CFDefinition

[benedict]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 bcc68fe4a - b48d0da6d
  refs/heads/cassandra-2.1.0 29a993485 - 0e393c935
  refs/heads/trunk e90c493cb - 89463a567


Fix typo in CFDefinition

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7452


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c95d084
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c95d084
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c95d084

Branch: refs/heads/cassandra-2.1
Commit: 4c95d08480a88e31763da7926d379e9e4bc264a9
Parents: 3425200
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Jul 2 17:19:18 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Jul 2 17:19:18 2014 +0200

--
 src/java/org/apache/cassandra/cql3/CFDefinition.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c95d084/src/java/org/apache/cassandra/cql3/CFDefinition.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CFDefinition.java 
b/src/java/org/apache/cassandra/cql3/CFDefinition.java
index 3266c95..23bedaf 100644
--- a/src/java/org/apache/cassandra/cql3/CFDefinition.java
+++ b/src/java/org/apache/cassandra/cql3/CFDefinition.java
@@ -152,7 +152,7 @@ public class CFDefinition implements 
IterableCFDefinition.Name
 
 public CollectionName staticColumns()
 {
-return regularColumns.values();
+return staticColumns.values();
 }
 
 public Name compactValue()

[02/10] git commit: Fix typo in CFDefinition

[benedict]

Fix typo in CFDefinition

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7452


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c95d084
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c95d084
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c95d084

Branch: refs/heads/trunk
Commit: 4c95d08480a88e31763da7926d379e9e4bc264a9
Parents: 3425200
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Jul 2 17:19:18 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Jul 2 17:19:18 2014 +0200

--
 src/java/org/apache/cassandra/cql3/CFDefinition.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c95d084/src/java/org/apache/cassandra/cql3/CFDefinition.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CFDefinition.java 
b/src/java/org/apache/cassandra/cql3/CFDefinition.java
index 3266c95..23bedaf 100644
--- a/src/java/org/apache/cassandra/cql3/CFDefinition.java
+++ b/src/java/org/apache/cassandra/cql3/CFDefinition.java
@@ -152,7 +152,7 @@ public class CFDefinition implements 
IterableCFDefinition.Name
 
 public CollectionName staticColumns()
 {
-return regularColumns.values();
+return staticColumns.values();
 }
 
 public Name compactValue()

[01/10] git commit: fix typo

[brandonwilliams]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 de1f7ee1e - 4e67631ef
  refs/heads/cassandra-2.0 367c74193 - 81286b0ca
  refs/heads/cassandra-2.1 86b6ec529 - 8cb50583d
  refs/heads/trunk 1b62f3d39 - 707eabdc9


fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e67631e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e67631e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e67631e

Branch: refs/heads/cassandra-1.2
Commit: 4e67631ef84464ee4a1c141719521e835ddcd529
Parents: de1f7ee
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue May 27 18:11:38 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue May 27 18:11:38 2014 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e67631e/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 9a6e67a..8e7c073 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -739,7 +739,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 if (existing != null)
 {
 if 
(Gossiper.instance.getEndpointStateForEndpoint(existing).getUpdateTimestamp()  
(System.currentTimeMillis() - delay))
-throw new 
UnsupportedOperationException(Cannnot replace a live node... );
+throw new 
UnsupportedOperationException(Cannot replace a live node... );
 current.add(existing);
 }
 else

[02/10] git commit: fix typo

[brandonwilliams]

fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e67631e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e67631e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e67631e

Branch: refs/heads/cassandra-2.0
Commit: 4e67631ef84464ee4a1c141719521e835ddcd529
Parents: de1f7ee
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue May 27 18:11:38 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue May 27 18:11:38 2014 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e67631e/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 9a6e67a..8e7c073 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -739,7 +739,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 if (existing != null)
 {
 if 
(Gossiper.instance.getEndpointStateForEndpoint(existing).getUpdateTimestamp()  
(System.currentTimeMillis() - delay))
-throw new 
UnsupportedOperationException(Cannnot replace a live node... );
+throw new 
UnsupportedOperationException(Cannot replace a live node... );
 current.add(existing);
 }
 else

[04/10] git commit: fix typo

[brandonwilliams]

fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e67631e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e67631e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e67631e

Branch: refs/heads/trunk
Commit: 4e67631ef84464ee4a1c141719521e835ddcd529
Parents: de1f7ee
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue May 27 18:11:38 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue May 27 18:11:38 2014 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e67631e/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 9a6e67a..8e7c073 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -739,7 +739,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 if (existing != null)
 {
 if 
(Gossiper.instance.getEndpointStateForEndpoint(existing).getUpdateTimestamp()  
(System.currentTimeMillis() - delay))
-throw new 
UnsupportedOperationException(Cannnot replace a live node... );
+throw new 
UnsupportedOperationException(Cannot replace a live node... );
 current.add(existing);
 }
 else

[03/10] git commit: fix typo

[brandonwilliams]

fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e67631e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e67631e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e67631e

Branch: refs/heads/cassandra-2.1
Commit: 4e67631ef84464ee4a1c141719521e835ddcd529
Parents: de1f7ee
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue May 27 18:11:38 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue May 27 18:11:38 2014 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e67631e/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 9a6e67a..8e7c073 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -739,7 +739,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 if (existing != null)
 {
 if 
(Gossiper.instance.getEndpointStateForEndpoint(existing).getUpdateTimestamp()  
(System.currentTimeMillis() - delay))
-throw new 
UnsupportedOperationException(Cannnot replace a live node... );
+throw new 
UnsupportedOperationException(Cannot replace a live node... );
 current.add(existing);
 }
 else

git commit: fix typo

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/trunk d2b6063ad - 401ed436a


fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/401ed436
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/401ed436
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/401ed436

Branch: refs/heads/trunk
Commit: 401ed436ab0ca1f9294fbdd26d3da78ee70e9c3f
Parents: d2b6063
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Thu May 15 22:32:41 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Thu May 15 22:32:41 2014 -0400

--
 .../triggers/src/org/apache/cassandra/triggers/InvertedIndex.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/401ed436/examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java
--
diff --git 
a/examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java 
b/examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java
index fa90053..cdcb962 100644
--- a/examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java
+++ b/examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java
@@ -42,7 +42,7 @@ public class InvertedIndex implements ITrigger
 ListMutation mutations = new ArrayList(update.getColumnCount());
 
 String indexKeySpace = properties.getProperty(keyspace);
-String indexColumnFamily = properties.getProperty(columnfamily)
+String indexColumnFamily = properties.getProperty(columnfamily);
 for (Cell cell : update)
 {
 // Skip the row marker and other empty values, since they lead to 
an empty key.

[1/4] git commit: Fix typo in DeletionInfo

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 07dc6e189 - 0fce7ace0


Fix typo in DeletionInfo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91130373
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91130373
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91130373

Branch: refs/heads/cassandra-2.0
Commit: 91130373f474c8a8d8f5100044507553d2a9b872
Parents: 35d4b5d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Mar 24 17:06:01 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Mar 24 17:06:01 2014 +0100

--
 src/java/org/apache/cassandra/db/DeletionInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/91130373/src/java/org/apache/cassandra/db/DeletionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/DeletionInfo.java 
b/src/java/org/apache/cassandra/db/DeletionInfo.java
index 91af9fd..ce683d1 100644
--- a/src/java/org/apache/cassandra/db/DeletionInfo.java
+++ b/src/java/org/apache/cassandra/db/DeletionInfo.java
@@ -227,7 +227,7 @@ public class DeletionInfo
 public boolean mayModify(DeletionInfo delInfo)
 {
 return topLevel.markedForDeleteAt  delInfo.topLevel.markedForDeleteAt
-|| ranges == null;
+|| ranges != null;
 }
 
 @Override

[1/5] git commit: Fix typo in DeletionInfo

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 2bb30af66 - e5639f44c


Fix typo in DeletionInfo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91130373
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91130373
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91130373

Branch: refs/heads/cassandra-2.1
Commit: 91130373f474c8a8d8f5100044507553d2a9b872
Parents: 35d4b5d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Mar 24 17:06:01 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Mar 24 17:06:01 2014 +0100

--
 src/java/org/apache/cassandra/db/DeletionInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/91130373/src/java/org/apache/cassandra/db/DeletionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/DeletionInfo.java 
b/src/java/org/apache/cassandra/db/DeletionInfo.java
index 91af9fd..ce683d1 100644
--- a/src/java/org/apache/cassandra/db/DeletionInfo.java
+++ b/src/java/org/apache/cassandra/db/DeletionInfo.java
@@ -227,7 +227,7 @@ public class DeletionInfo
 public boolean mayModify(DeletionInfo delInfo)
 {
 return topLevel.markedForDeleteAt  delInfo.topLevel.markedForDeleteAt
-|| ranges == null;
+|| ranges != null;
 }
 
 @Override

[1/8] git commit: Fix typo in DeletionInfo

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 93bd9ec25 - 3b1423945


Fix typo in DeletionInfo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91130373
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91130373
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91130373

Branch: refs/heads/trunk
Commit: 91130373f474c8a8d8f5100044507553d2a9b872
Parents: 35d4b5d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Mar 24 17:06:01 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Mar 24 17:06:01 2014 +0100

--
 src/java/org/apache/cassandra/db/DeletionInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/91130373/src/java/org/apache/cassandra/db/DeletionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/DeletionInfo.java 
b/src/java/org/apache/cassandra/db/DeletionInfo.java
index 91af9fd..ce683d1 100644
--- a/src/java/org/apache/cassandra/db/DeletionInfo.java
+++ b/src/java/org/apache/cassandra/db/DeletionInfo.java
@@ -227,7 +227,7 @@ public class DeletionInfo
 public boolean mayModify(DeletionInfo delInfo)
 {
 return topLevel.markedForDeleteAt  delInfo.topLevel.markedForDeleteAt
-|| ranges == null;
+|| ranges != null;
 }
 
 @Override

git commit: Fix typo in DeletionInfo

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 35d4b5de8 - 91130373f


Fix typo in DeletionInfo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91130373
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91130373
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91130373

Branch: refs/heads/cassandra-1.2
Commit: 91130373f474c8a8d8f5100044507553d2a9b872
Parents: 35d4b5d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Mar 24 17:06:01 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Mar 24 17:06:01 2014 +0100

--
 src/java/org/apache/cassandra/db/DeletionInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/91130373/src/java/org/apache/cassandra/db/DeletionInfo.java
--
diff --git a/src/java/org/apache/cassandra/db/DeletionInfo.java 
b/src/java/org/apache/cassandra/db/DeletionInfo.java
index 91af9fd..ce683d1 100644
--- a/src/java/org/apache/cassandra/db/DeletionInfo.java
+++ b/src/java/org/apache/cassandra/db/DeletionInfo.java
@@ -227,7 +227,7 @@ public class DeletionInfo
 public boolean mayModify(DeletionInfo delInfo)
 {
 return topLevel.markedForDeleteAt  delInfo.topLevel.markedForDeleteAt
-|| ranges == null;
+|| ranges != null;
 }
 
 @Override

git commit: Fix typo

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 67119a5ab - 7abfbab72


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7abfbab7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7abfbab7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7abfbab7

Branch: refs/heads/cassandra-2.1
Commit: 7abfbab7284648164ee511252197b31b3c5eb509
Parents: 67119a5
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Mar 17 12:50:19 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Mar 17 12:50:19 2014 +0100

--
 .../org/apache/cassandra/db/columniterator/IndexedSliceReader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7abfbab7/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
--
diff --git 
a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java 
b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
index 9c1fece..2a22cc6 100644
--- a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
+++ b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
@@ -196,7 +196,7 @@ class IndexedSliceReader extends 
AbstractIteratorOnDiskAtom implements OnDiskA
 {
 // See indexFor above.
 return sstable.metadata.isSuper()  
sstable.descriptor.version.hasSuperColumns
- ? CellNames.compositeDense(SuperColumns.scName(name))
+ ? CellNames.simpleDense(SuperColumns.scName(name))
  : name;
 }
 

[1/2] git commit: Fix typo

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 67b852182 - 6a97a9c94


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7abfbab7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7abfbab7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7abfbab7

Branch: refs/heads/trunk
Commit: 7abfbab7284648164ee511252197b31b3c5eb509
Parents: 67119a5
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Mar 17 12:50:19 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Mar 17 12:50:19 2014 +0100

--
 .../org/apache/cassandra/db/columniterator/IndexedSliceReader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7abfbab7/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
--
diff --git 
a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java 
b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
index 9c1fece..2a22cc6 100644
--- a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
+++ b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
@@ -196,7 +196,7 @@ class IndexedSliceReader extends 
AbstractIteratorOnDiskAtom implements OnDiskA
 {
 // See indexFor above.
 return sstable.metadata.isSuper()  
sstable.descriptor.version.hasSuperColumns
- ? CellNames.compositeDense(SuperColumns.scName(name))
+ ? CellNames.simpleDense(SuperColumns.scName(name))
  : name;
 }
 

git commit: fix typo in cfmbean comparator

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 64098f7d6 - 1e1129c61


fix typo in cfmbean comparator


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e1129c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e1129c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e1129c6

Branch: refs/heads/cassandra-1.2
Commit: 1e1129c61db7e410816854c8f62f1c600d10644f
Parents: 64098f7
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat Mar 8 21:48:57 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat Mar 8 21:48:57 2014 -0500

--
 src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e1129c6/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java 
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 1557a6a..d2393ca 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -895,7 +895,7 @@ class ColumnFamilyStoreMBeanIterator implements 
IteratorMap.EntryString, Colum
 
 // get CF name and split it for index name
 String e1CF[] = 
e1.getValue().getColumnFamilyName().split(\\.);
-String e2CF[] = 
e1.getValue().getColumnFamilyName().split(\\.);
+String e2CF[] = 
e2.getValue().getColumnFamilyName().split(\\.);
 assert e1CF.length = 2  e2CF.length = 2 : unexpected 
split count for column family name;
 
 //if neither are indexes, just compare CF names

[1/2] git commit: fix typo in cfmbean comparator

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 656edc529 - 8f0952eb5


fix typo in cfmbean comparator


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e1129c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e1129c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e1129c6

Branch: refs/heads/cassandra-2.0
Commit: 1e1129c61db7e410816854c8f62f1c600d10644f
Parents: 64098f7
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat Mar 8 21:48:57 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat Mar 8 21:48:57 2014 -0500

--
 src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e1129c6/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java 
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 1557a6a..d2393ca 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -895,7 +895,7 @@ class ColumnFamilyStoreMBeanIterator implements 
IteratorMap.EntryString, Colum
 
 // get CF name and split it for index name
 String e1CF[] = 
e1.getValue().getColumnFamilyName().split(\\.);
-String e2CF[] = 
e1.getValue().getColumnFamilyName().split(\\.);
+String e2CF[] = 
e2.getValue().getColumnFamilyName().split(\\.);
 assert e1CF.length = 2  e2CF.length = 2 : unexpected 
split count for column family name;
 
 //if neither are indexes, just compare CF names

[2/4] git commit: fix typo in cfmbean comparator

[dbrosius]

fix typo in cfmbean comparator


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e1129c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e1129c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e1129c6

Branch: refs/heads/cassandra-2.1
Commit: 1e1129c61db7e410816854c8f62f1c600d10644f
Parents: 64098f7
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat Mar 8 21:48:57 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat Mar 8 21:48:57 2014 -0500

--
 src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e1129c6/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java 
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 1557a6a..d2393ca 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -895,7 +895,7 @@ class ColumnFamilyStoreMBeanIterator implements 
IteratorMap.EntryString, Colum
 
 // get CF name and split it for index name
 String e1CF[] = 
e1.getValue().getColumnFamilyName().split(\\.);
-String e2CF[] = 
e1.getValue().getColumnFamilyName().split(\\.);
+String e2CF[] = 
e2.getValue().getColumnFamilyName().split(\\.);
 assert e1CF.length = 2  e2CF.length = 2 : unexpected 
split count for column family name;
 
 //if neither are indexes, just compare CF names

[2/5] git commit: fix typo in cfmbean comparator

[dbrosius]

fix typo in cfmbean comparator


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e1129c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e1129c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e1129c6

Branch: refs/heads/trunk
Commit: 1e1129c61db7e410816854c8f62f1c600d10644f
Parents: 64098f7
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat Mar 8 21:48:57 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat Mar 8 21:48:57 2014 -0500

--
 src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e1129c6/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java 
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 1557a6a..d2393ca 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -895,7 +895,7 @@ class ColumnFamilyStoreMBeanIterator implements 
IteratorMap.EntryString, Colum
 
 // get CF name and split it for index name
 String e1CF[] = 
e1.getValue().getColumnFamilyName().split(\\.);
-String e2CF[] = 
e1.getValue().getColumnFamilyName().split(\\.);
+String e2CF[] = 
e2.getValue().getColumnFamilyName().split(\\.);
 assert e1CF.length = 2  e2CF.length = 2 : unexpected 
split count for column family name;
 
 //if neither are indexes, just compare CF names

git commit: Fix typo in changelog

[slebresne]

Updated Branches:
  refs/heads/cassandra-1.2 4cb045a58 - df86e8fb1


Fix typo in changelog


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df86e8fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df86e8fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df86e8fb

Branch: refs/heads/cassandra-1.2
Commit: df86e8fb10d191280ece762bbe6294ccef6ad48d
Parents: 4cb045a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Jan 31 13:28:08 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Jan 31 13:28:08 2014 +0100

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df86e8fb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d85d3a4..68bed3b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,7 +13,7 @@
  * Add ability to throttle batchlog replay (CASSANDRA-6550)
  * Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
  * Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
- * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
+ * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6598)
  * Paginate batchlog replay (CASSANDRA-6569)
  * skip blocking on streaming during drain (CASSANDRA-6603)
  * Improve error message when schema doesn't match loaded sstable 
(CASSANDRA-6262)

[1/2] git commit: Fix typo in changelog

[slebresne]

Updated Branches:
  refs/heads/cassandra-2.0 9d70cf3b9 - f6a7a5be5


Fix typo in changelog


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df86e8fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df86e8fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df86e8fb

Branch: refs/heads/cassandra-2.0
Commit: df86e8fb10d191280ece762bbe6294ccef6ad48d
Parents: 4cb045a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Jan 31 13:28:08 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Jan 31 13:28:08 2014 +0100

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df86e8fb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d85d3a4..68bed3b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,7 +13,7 @@
  * Add ability to throttle batchlog replay (CASSANDRA-6550)
  * Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
  * Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
- * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
+ * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6598)
  * Paginate batchlog replay (CASSANDRA-6569)
  * skip blocking on streaming during drain (CASSANDRA-6603)
  * Improve error message when schema doesn't match loaded sstable 
(CASSANDRA-6262)

[08/11] git commit: Fix typo in changelog

[jasobrown]

Fix typo in changelog


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df86e8fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df86e8fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df86e8fb

Branch: refs/heads/trunk
Commit: df86e8fb10d191280ece762bbe6294ccef6ad48d
Parents: 4cb045a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Jan 31 13:28:08 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Jan 31 13:28:08 2014 +0100

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df86e8fb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index d85d3a4..68bed3b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,7 +13,7 @@
  * Add ability to throttle batchlog replay (CASSANDRA-6550)
  * Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
  * Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
- * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
+ * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6598)
  * Paginate batchlog replay (CASSANDRA-6569)
  * skip blocking on streaming during drain (CASSANDRA-6603)
  * Improve error message when schema doesn't match loaded sstable 
(CASSANDRA-6262)

git commit: fix typo

[dbrosius]

Updated Branches:
  refs/heads/trunk 660902929 - b2933717c


fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2933717
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2933717
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2933717

Branch: refs/heads/trunk
Commit: b2933717c423e5510e35a096e38d084e139cb141
Parents: 6609029
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri Dec 27 16:53:03 2013 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri Dec 27 16:53:03 2013 -0500

--
 .../src/org/apache/cassandra/stress/operations/CqlOperation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2933717/tools/stress/src/org/apache/cassandra/stress/operations/CqlOperation.java
--
diff --git 
a/tools/stress/src/org/apache/cassandra/stress/operations/CqlOperation.java 
b/tools/stress/src/org/apache/cassandra/stress/operations/CqlOperation.java
index 1f734be..744e7f6 100644
--- a/tools/stress/src/org/apache/cassandra/stress/operations/CqlOperation.java
+++ b/tools/stress/src/org/apache/cassandra/stress/operations/CqlOperation.java
@@ -334,7 +334,7 @@ public abstract class CqlOperationV extends Operation
 {
 String formattedQuery = formatCqlQuery(query, queryParams, true);
 return handler.simpleNativeHandler().apply(
-client.execute_cql3_query(query, key, Compression.NONE, 
state.settings.command.consistencyLevel)
+client.execute_cql3_query(formattedQuery, key, 
Compression.NONE, state.settings.command.consistencyLevel)
 );
 }
 

git commit: Fix typo

[aleksey]

Updated Branches:
  refs/heads/cassandra-1.2 a4895c551 - b97c5233e


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b97c5233
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b97c5233
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b97c5233

Branch: refs/heads/cassandra-1.2
Commit: b97c5233e17b73232be3554cf06b8ae6e472b145
Parents: a4895c5
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Dec 20 19:52:00 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Dec 20 19:52:00 2013 +0300

--
 src/java/org/apache/cassandra/cql3/CQLStatement.java  |  2 +-
 .../org/apache/cassandra/cql3/QueryProcessor.java | 14 +++---
 .../cql3/statements/AuthenticationStatement.java  |  2 +-
 .../cql3/statements/AuthorizationStatement.java   |  2 +-
 .../cassandra/cql3/statements/BatchStatement.java |  3 +--
 .../cql3/statements/CreateColumnFamilyStatement.java  |  2 +-
 .../cassandra/cql3/statements/DeleteStatement.java|  2 +-
 .../cassandra/cql3/statements/ParsedStatement.java|  2 +-
 .../cassandra/cql3/statements/SelectStatement.java|  6 +++---
 .../cassandra/cql3/statements/UpdateStatement.java|  2 +-
 .../org/apache/cassandra/thrift/CassandraServer.java  |  2 +-
 11 files changed, 19 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b97c5233/src/java/org/apache/cassandra/cql3/CQLStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CQLStatement.java 
b/src/java/org/apache/cassandra/cql3/CQLStatement.java
index 63f9cc6..02475e9 100644
--- a/src/java/org/apache/cassandra/cql3/CQLStatement.java
+++ b/src/java/org/apache/cassandra/cql3/CQLStatement.java
@@ -31,7 +31,7 @@ public interface CQLStatement
 /**
  * Returns the number of bound terms in this statement.
  */
-public int getBoundsTerms();
+public int getBoundTerms();
 
 /**
  * Perform any access verification necessary for the statement.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b97c5233/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java 
b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index a62b248..332aea1 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -153,7 +153,7 @@ public class QueryProcessor
 throws RequestExecutionException, RequestValidationException
 {
 CQLStatement prepared = getStatement(queryString, 
queryState.getClientState()).statement;
-if (prepared.getBoundsTerms()  0)
+if (prepared.getBoundTerms()  0)
 throw new InvalidRequestException(Cannot execute query with bind 
variables);
 return processStatement(prepared, cl, queryState, 
Collections.ByteBufferemptyList());
 }
@@ -220,7 +220,7 @@ public class QueryProcessor
 ParsedStatement.Prepared prepared = getStatement(queryString, 
clientState);
 ResultMessage.Prepared msg = storePreparedStatement(queryString, 
clientState.getRawKeyspace(), prepared, forThrift);
 
-int bountTerms = prepared.statement.getBoundsTerms();
+int bountTerms = prepared.statement.getBoundTerms();
 if (bountTerms  FBUtilities.MAX_UNSIGNED_SHORT)
 throw new InvalidRequestException(String.format(Too many 
markers(?). %d markers exceed the allowed maximum of %d, bountTerms, 
FBUtilities.MAX_UNSIGNED_SHORT));
 assert bountTerms == prepared.boundNames.size();
@@ -246,7 +246,7 @@ public class QueryProcessor
 thriftPreparedStatements.put(statementId, prepared.statement);
 logger.trace(String.format(Stored prepared statement #%d with %d 
bind markers,
statementId,
-   prepared.statement.getBoundsTerms()));
+   prepared.statement.getBoundTerms()));
 return ResultMessage.Prepared.forThrift(statementId, 
prepared.boundNames);
 }
 else
@@ -255,7 +255,7 @@ public class QueryProcessor
 preparedStatements.put(statementId, prepared.statement);
 logger.trace(String.format(Stored prepared statement %s with %d 
bind markers,
  statementId,
- prepared.statement.getBoundsTerms()));
+ prepared.statement.getBoundTerms()));
 return new ResultMessage.Prepared(statementId, 
prepared.boundNames);
 }
 }
@@ -264,11 +264,11 @@ public class QueryProcessor
 throws 

[1/4] git commit: Fix typo

[aleksey]

Updated Branches:
  refs/heads/cassandra-2.0 4d36bbfbb - 9c17189b7


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b97c5233
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b97c5233
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b97c5233

Branch: refs/heads/cassandra-2.0
Commit: b97c5233e17b73232be3554cf06b8ae6e472b145
Parents: a4895c5
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Dec 20 19:52:00 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Dec 20 19:52:00 2013 +0300

--
 src/java/org/apache/cassandra/cql3/CQLStatement.java  |  2 +-
 .../org/apache/cassandra/cql3/QueryProcessor.java | 14 +++---
 .../cql3/statements/AuthenticationStatement.java  |  2 +-
 .../cql3/statements/AuthorizationStatement.java   |  2 +-
 .../cassandra/cql3/statements/BatchStatement.java |  3 +--
 .../cql3/statements/CreateColumnFamilyStatement.java  |  2 +-
 .../cassandra/cql3/statements/DeleteStatement.java|  2 +-
 .../cassandra/cql3/statements/ParsedStatement.java|  2 +-
 .../cassandra/cql3/statements/SelectStatement.java|  6 +++---
 .../cassandra/cql3/statements/UpdateStatement.java|  2 +-
 .../org/apache/cassandra/thrift/CassandraServer.java  |  2 +-
 11 files changed, 19 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b97c5233/src/java/org/apache/cassandra/cql3/CQLStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CQLStatement.java 
b/src/java/org/apache/cassandra/cql3/CQLStatement.java
index 63f9cc6..02475e9 100644
--- a/src/java/org/apache/cassandra/cql3/CQLStatement.java
+++ b/src/java/org/apache/cassandra/cql3/CQLStatement.java
@@ -31,7 +31,7 @@ public interface CQLStatement
 /**
  * Returns the number of bound terms in this statement.
  */
-public int getBoundsTerms();
+public int getBoundTerms();
 
 /**
  * Perform any access verification necessary for the statement.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b97c5233/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java 
b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index a62b248..332aea1 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -153,7 +153,7 @@ public class QueryProcessor
 throws RequestExecutionException, RequestValidationException
 {
 CQLStatement prepared = getStatement(queryString, 
queryState.getClientState()).statement;
-if (prepared.getBoundsTerms()  0)
+if (prepared.getBoundTerms()  0)
 throw new InvalidRequestException(Cannot execute query with bind 
variables);
 return processStatement(prepared, cl, queryState, 
Collections.ByteBufferemptyList());
 }
@@ -220,7 +220,7 @@ public class QueryProcessor
 ParsedStatement.Prepared prepared = getStatement(queryString, 
clientState);
 ResultMessage.Prepared msg = storePreparedStatement(queryString, 
clientState.getRawKeyspace(), prepared, forThrift);
 
-int bountTerms = prepared.statement.getBoundsTerms();
+int bountTerms = prepared.statement.getBoundTerms();
 if (bountTerms  FBUtilities.MAX_UNSIGNED_SHORT)
 throw new InvalidRequestException(String.format(Too many 
markers(?). %d markers exceed the allowed maximum of %d, bountTerms, 
FBUtilities.MAX_UNSIGNED_SHORT));
 assert bountTerms == prepared.boundNames.size();
@@ -246,7 +246,7 @@ public class QueryProcessor
 thriftPreparedStatements.put(statementId, prepared.statement);
 logger.trace(String.format(Stored prepared statement #%d with %d 
bind markers,
statementId,
-   prepared.statement.getBoundsTerms()));
+   prepared.statement.getBoundTerms()));
 return ResultMessage.Prepared.forThrift(statementId, 
prepared.boundNames);
 }
 else
@@ -255,7 +255,7 @@ public class QueryProcessor
 preparedStatements.put(statementId, prepared.statement);
 logger.trace(String.format(Stored prepared statement %s with %d 
bind markers,
  statementId,
- prepared.statement.getBoundsTerms()));
+ prepared.statement.getBoundTerms()));
 return new ResultMessage.Prepared(statementId, 
prepared.boundNames);
 }
 }
@@ -264,11 +264,11 @@ public class QueryProcessor
 throws 

[1/5] git commit: Fix typo

[aleksey]

Updated Branches:
  refs/heads/trunk 0d695d4d1 - ed6584ee1


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b97c5233
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b97c5233
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b97c5233

Branch: refs/heads/trunk
Commit: b97c5233e17b73232be3554cf06b8ae6e472b145
Parents: a4895c5
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Dec 20 19:52:00 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Dec 20 19:52:00 2013 +0300

--
 src/java/org/apache/cassandra/cql3/CQLStatement.java  |  2 +-
 .../org/apache/cassandra/cql3/QueryProcessor.java | 14 +++---
 .../cql3/statements/AuthenticationStatement.java  |  2 +-
 .../cql3/statements/AuthorizationStatement.java   |  2 +-
 .../cassandra/cql3/statements/BatchStatement.java |  3 +--
 .../cql3/statements/CreateColumnFamilyStatement.java  |  2 +-
 .../cassandra/cql3/statements/DeleteStatement.java|  2 +-
 .../cassandra/cql3/statements/ParsedStatement.java|  2 +-
 .../cassandra/cql3/statements/SelectStatement.java|  6 +++---
 .../cassandra/cql3/statements/UpdateStatement.java|  2 +-
 .../org/apache/cassandra/thrift/CassandraServer.java  |  2 +-
 11 files changed, 19 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b97c5233/src/java/org/apache/cassandra/cql3/CQLStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CQLStatement.java 
b/src/java/org/apache/cassandra/cql3/CQLStatement.java
index 63f9cc6..02475e9 100644
--- a/src/java/org/apache/cassandra/cql3/CQLStatement.java
+++ b/src/java/org/apache/cassandra/cql3/CQLStatement.java
@@ -31,7 +31,7 @@ public interface CQLStatement
 /**
  * Returns the number of bound terms in this statement.
  */
-public int getBoundsTerms();
+public int getBoundTerms();
 
 /**
  * Perform any access verification necessary for the statement.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b97c5233/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java 
b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index a62b248..332aea1 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -153,7 +153,7 @@ public class QueryProcessor
 throws RequestExecutionException, RequestValidationException
 {
 CQLStatement prepared = getStatement(queryString, 
queryState.getClientState()).statement;
-if (prepared.getBoundsTerms()  0)
+if (prepared.getBoundTerms()  0)
 throw new InvalidRequestException(Cannot execute query with bind 
variables);
 return processStatement(prepared, cl, queryState, 
Collections.ByteBufferemptyList());
 }
@@ -220,7 +220,7 @@ public class QueryProcessor
 ParsedStatement.Prepared prepared = getStatement(queryString, 
clientState);
 ResultMessage.Prepared msg = storePreparedStatement(queryString, 
clientState.getRawKeyspace(), prepared, forThrift);
 
-int bountTerms = prepared.statement.getBoundsTerms();
+int bountTerms = prepared.statement.getBoundTerms();
 if (bountTerms  FBUtilities.MAX_UNSIGNED_SHORT)
 throw new InvalidRequestException(String.format(Too many 
markers(?). %d markers exceed the allowed maximum of %d, bountTerms, 
FBUtilities.MAX_UNSIGNED_SHORT));
 assert bountTerms == prepared.boundNames.size();
@@ -246,7 +246,7 @@ public class QueryProcessor
 thriftPreparedStatements.put(statementId, prepared.statement);
 logger.trace(String.format(Stored prepared statement #%d with %d 
bind markers,
statementId,
-   prepared.statement.getBoundsTerms()));
+   prepared.statement.getBoundTerms()));
 return ResultMessage.Prepared.forThrift(statementId, 
prepared.boundNames);
 }
 else
@@ -255,7 +255,7 @@ public class QueryProcessor
 preparedStatements.put(statementId, prepared.statement);
 logger.trace(String.format(Stored prepared statement %s with %d 
bind markers,
  statementId,
- prepared.statement.getBoundsTerms()));
+ prepared.statement.getBoundTerms()));
 return new ResultMessage.Prepared(statementId, 
prepared.boundNames);
 }
 }
@@ -264,11 +264,11 @@ public class QueryProcessor
 throws 

git commit: Fix typo

[slebresne]

Updated Branches:
  refs/heads/cassandra-1.2 0ffa5c20a - 1ac601980


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ac60198
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ac60198
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ac60198

Branch: refs/heads/cassandra-1.2
Commit: 1ac601980382516419bfe45b01ce1b8eccf4d9ce
Parents: 0ffa5c2
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Nov 18 17:30:55 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Nov 18 17:30:55 2013 +0100

--
 src/java/org/apache/cassandra/thrift/CassandraServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ac60198/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java 
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 5b9fbfd..883ab5a 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -1407,7 +1407,7 @@ public class CassandraServer implements Cassandra.Iface
 if (oldCfm == null)
 throw new InvalidRequestException(Could not find column 
family definition to modify.);
 
-if (!oldCfm.isThriftIncompatible())
+if (oldCfm.isThriftIncompatible())
 throw new InvalidRequestException(Cannot modify CQL3 table  
+ oldCfm.cfName +  as it may break the schema. You should use cqlsh to modify 
CQL3 tables instead.);
 
 state().hasColumnFamilyAccess(cf_def.keyspace, cf_def.name, 
Permission.ALTER);

[1/2] git commit: Fix typo

[slebresne]

Updated Branches:
  refs/heads/cassandra-2.0 25471bac3 - fd6ff


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ac60198
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ac60198
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ac60198

Branch: refs/heads/cassandra-2.0
Commit: 1ac601980382516419bfe45b01ce1b8eccf4d9ce
Parents: 0ffa5c2
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Nov 18 17:30:55 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Nov 18 17:30:55 2013 +0100

--
 src/java/org/apache/cassandra/thrift/CassandraServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ac60198/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java 
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 5b9fbfd..883ab5a 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -1407,7 +1407,7 @@ public class CassandraServer implements Cassandra.Iface
 if (oldCfm == null)
 throw new InvalidRequestException(Could not find column 
family definition to modify.);
 
-if (!oldCfm.isThriftIncompatible())
+if (oldCfm.isThriftIncompatible())
 throw new InvalidRequestException(Cannot modify CQL3 table  
+ oldCfm.cfName +  as it may break the schema. You should use cqlsh to modify 
CQL3 tables instead.);
 
 state().hasColumnFamilyAccess(cf_def.keyspace, cf_def.name, 
Permission.ALTER);

[5/7] git commit: Fix typo

[slebresne]

Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ac60198
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ac60198
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ac60198

Branch: refs/heads/trunk
Commit: 1ac601980382516419bfe45b01ce1b8eccf4d9ce
Parents: 0ffa5c2
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Nov 18 17:30:55 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Nov 18 17:30:55 2013 +0100

--
 src/java/org/apache/cassandra/thrift/CassandraServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ac60198/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java 
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 5b9fbfd..883ab5a 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -1407,7 +1407,7 @@ public class CassandraServer implements Cassandra.Iface
 if (oldCfm == null)
 throw new InvalidRequestException(Could not find column 
family definition to modify.);
 
-if (!oldCfm.isThriftIncompatible())
+if (oldCfm.isThriftIncompatible())
 throw new InvalidRequestException(Cannot modify CQL3 table  
+ oldCfm.cfName +  as it may break the schema. You should use cqlsh to modify 
CQL3 tables instead.);
 
 state().hasColumnFamilyAccess(cf_def.keyspace, cf_def.name, 
Permission.ALTER);

git commit: Fix typo

[slebresne]

Updated Branches:
  refs/heads/trunk 5c21711e7 - 6c9efb0e1


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c9efb0e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c9efb0e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c9efb0e

Branch: refs/heads/trunk
Commit: 6c9efb0e16ebb65fb1989ae4c28074c83f792946
Parents: 5c21711
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Nov 4 16:04:07 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Nov 4 16:04:22 2013 +0100

--
 src/java/org/apache/cassandra/cql3/ResultSet.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c9efb0e/src/java/org/apache/cassandra/cql3/ResultSet.java
--
diff --git a/src/java/org/apache/cassandra/cql3/ResultSet.java 
b/src/java/org/apache/cassandra/cql3/ResultSet.java
index 79459df..4468637 100644
--- a/src/java/org/apache/cassandra/cql3/ResultSet.java
+++ b/src/java/org/apache/cassandra/cql3/ResultSet.java
@@ -310,7 +310,7 @@ public class ResultSet
 {
 for (ColumnSpecification name : names)
 {
-sb.append([).append(name.toString());
+sb.append([).append(name.name.toString());
 sb.append(().append(name.ksName).append(, 
).append(name.cfName).append());
 sb.append(, ).append(name.type).append(]);
 }
@@ -389,7 +389,7 @@ public class ResultSet
 CBUtil.writeString(name.ksName, dest);
 CBUtil.writeString(name.cfName, dest);
 }
-CBUtil.writeString(name.toString(), dest);
+CBUtil.writeString(name.name.toString(), dest);
 DataType.codec.writeOne(DataType.fromType(name.type), 
dest);
 }
 }
@@ -420,7 +420,7 @@ public class ResultSet
 size += CBUtil.sizeOfString(name.ksName);
 size += CBUtil.sizeOfString(name.cfName);
 }
-size += CBUtil.sizeOfString(name.toString());
+size += CBUtil.sizeOfString(name.name.toString());
 size += 
DataType.codec.oneSerializedSize(DataType.fromType(name.type));
 }
 }

[1/2] git commit: fix typo in test

[dbrosius]

Updated Branches:
  refs/heads/cassandra-2.0 3a7093356 - ed7b08b39


fix typo in test


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d3d67e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d3d67e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d3d67e5

Branch: refs/heads/cassandra-2.0
Commit: 8d3d67e5f2ce2a215dc9f72ca252e5f0efdadc6e
Parents: bdb269a
Author: Dave Brosius dbros...@apache.org
Authored: Fri Sep 27 22:03:15 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Fri Sep 27 22:03:15 2013 -0400

--
 test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d3d67e5/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java 
b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
index 67e3623..8166ffd 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
@@ -109,10 +109,10 @@ public class RangeTombstoneListTest
 assert !iter.hasNext();
 
 RangeTombstoneList l2 = new RangeTombstoneList(cmp, initialCapacity);
-l.add(rt(4, 10, 12L));
-l.add(rt(0, 8, 25L));
+l2.add(rt(4, 10, 12L));
+l2.add(rt(0, 8, 25L));
 
-assertEquals(25L, l.search(b(8)).markedForDeleteAt);
+assertEquals(25L, l2.search(b(8)).markedForDeleteAt);
 }
 
 @Test

git commit: fix typo in test

[dbrosius]

Updated Branches:
  refs/heads/cassandra-1.2 bdb269af0 - 8d3d67e5f


fix typo in test


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d3d67e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d3d67e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d3d67e5

Branch: refs/heads/cassandra-1.2
Commit: 8d3d67e5f2ce2a215dc9f72ca252e5f0efdadc6e
Parents: bdb269a
Author: Dave Brosius dbros...@apache.org
Authored: Fri Sep 27 22:03:15 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Fri Sep 27 22:03:15 2013 -0400

--
 test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d3d67e5/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java 
b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
index 67e3623..8166ffd 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
@@ -109,10 +109,10 @@ public class RangeTombstoneListTest
 assert !iter.hasNext();
 
 RangeTombstoneList l2 = new RangeTombstoneList(cmp, initialCapacity);
-l.add(rt(4, 10, 12L));
-l.add(rt(0, 8, 25L));
+l2.add(rt(4, 10, 12L));
+l2.add(rt(0, 8, 25L));
 
-assertEquals(25L, l.search(b(8)).markedForDeleteAt);
+assertEquals(25L, l2.search(b(8)).markedForDeleteAt);
 }
 
 @Test

[1/3] git commit: fix typo in test

[dbrosius]

Updated Branches:
  refs/heads/trunk fe54388ba - bb8e95c2b


fix typo in test


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d3d67e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d3d67e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d3d67e5

Branch: refs/heads/trunk
Commit: 8d3d67e5f2ce2a215dc9f72ca252e5f0efdadc6e
Parents: bdb269a
Author: Dave Brosius dbros...@apache.org
Authored: Fri Sep 27 22:03:15 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Fri Sep 27 22:03:15 2013 -0400

--
 test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d3d67e5/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java 
b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
index 67e3623..8166ffd 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
@@ -109,10 +109,10 @@ public class RangeTombstoneListTest
 assert !iter.hasNext();
 
 RangeTombstoneList l2 = new RangeTombstoneList(cmp, initialCapacity);
-l.add(rt(4, 10, 12L));
-l.add(rt(0, 8, 25L));
+l2.add(rt(4, 10, 12L));
+l2.add(rt(0, 8, 25L));
 
-assertEquals(25L, l.search(b(8)).markedForDeleteAt);
+assertEquals(25L, l2.search(b(8)).markedForDeleteAt);
 }
 
 @Test

git commit: Fix typo

[slebresne]

Updated Branches:
  refs/heads/cassandra-1.2 07b4878b0 - fc9b3a77b


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc9b3a77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc9b3a77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc9b3a77

Branch: refs/heads/cassandra-1.2
Commit: fc9b3a77bb3821033d7701dd2e2c693abbf322bb
Parents: 07b4878
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Sep 18 14:27:18 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Sep 18 14:27:18 2013 +0200

--
 src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc9b3a77/src/java/org/apache/cassandra/cql3/CQL3Type.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CQL3Type.java 
b/src/java/org/apache/cassandra/cql3/CQL3Type.java
index d7a4e8e..81f6c8a 100644
--- a/src/java/org/apache/cassandra/cql3/CQL3Type.java
+++ b/src/java/org/apache/cassandra/cql3/CQL3Type.java
@@ -209,7 +209,7 @@ public interface CQL3Type
 return set + ((SetType)type).elements.asCQL3Type() + 
;
 case MAP:
 MapType mt = (MapType)type;
-return set + mt.keys.asCQL3Type() + ,  + 
mt.values.asCQL3Type() + ;
+return map + mt.keys.asCQL3Type() + ,  + 
mt.values.asCQL3Type() + ;
 }
 throw new AssertionError();
 }

[1/4] git commit: Fix typo

[slebresne]

Updated Branches:
  refs/heads/trunk 08eb9c8f5 - 7d03e28b5


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc9b3a77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc9b3a77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc9b3a77

Branch: refs/heads/trunk
Commit: fc9b3a77bb3821033d7701dd2e2c693abbf322bb
Parents: 07b4878
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Sep 18 14:27:18 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Sep 18 14:27:18 2013 +0200

--
 src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc9b3a77/src/java/org/apache/cassandra/cql3/CQL3Type.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CQL3Type.java 
b/src/java/org/apache/cassandra/cql3/CQL3Type.java
index d7a4e8e..81f6c8a 100644
--- a/src/java/org/apache/cassandra/cql3/CQL3Type.java
+++ b/src/java/org/apache/cassandra/cql3/CQL3Type.java
@@ -209,7 +209,7 @@ public interface CQL3Type
 return set + ((SetType)type).elements.asCQL3Type() + 
;
 case MAP:
 MapType mt = (MapType)type;
-return set + mt.keys.asCQL3Type() + ,  + 
mt.values.asCQL3Type() + ;
+return map + mt.keys.asCQL3Type() + ,  + 
mt.values.asCQL3Type() + ;
 }
 throw new AssertionError();
 }

[1/2] git commit: Fix typo

[slebresne]

Updated Branches:
  refs/heads/cassandra-2.0 b38bec79c - a7b32deb9


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc9b3a77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc9b3a77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc9b3a77

Branch: refs/heads/cassandra-2.0
Commit: fc9b3a77bb3821033d7701dd2e2c693abbf322bb
Parents: 07b4878
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Sep 18 14:27:18 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Sep 18 14:27:18 2013 +0200

--
 src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc9b3a77/src/java/org/apache/cassandra/cql3/CQL3Type.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CQL3Type.java 
b/src/java/org/apache/cassandra/cql3/CQL3Type.java
index d7a4e8e..81f6c8a 100644
--- a/src/java/org/apache/cassandra/cql3/CQL3Type.java
+++ b/src/java/org/apache/cassandra/cql3/CQL3Type.java
@@ -209,7 +209,7 @@ public interface CQL3Type
 return set + ((SetType)type).elements.asCQL3Type() + 
;
 case MAP:
 MapType mt = (MapType)type;
-return set + mt.keys.asCQL3Type() + ,  + 
mt.values.asCQL3Type() + ;
+return map + mt.keys.asCQL3Type() + ,  + 
mt.values.asCQL3Type() + ;
 }
 throw new AssertionError();
 }

git commit: Fix typo

[slebresne]

Updated Branches:
  refs/heads/cassandra-1.2 02d9238e2 - 775dcbb50


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/775dcbb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/775dcbb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/775dcbb5

Branch: refs/heads/cassandra-1.2
Commit: 775dcbb50d99543f87f724e9f1cdb7a7f83554e2
Parents: 02d9238
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 26 17:39:38 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 26 17:39:38 2013 +0200

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/775dcbb5/conf/cassandra.yaml
--
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 28c43ba..d52f2e8 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -343,7 +343,7 @@ native_transport_port: 9042
 # transport is used. They are similar to rpc_min_threads and rpc_max_threads,
 # though the defaults differ slightly.
 # NOTE: native_transport_min_threads is now deprecated and ignored (but kept
-# in the 1.2.x serie for compatibility sake).
+# in the 1.2.x series for compatibility sake).
 # native_transport_min_threads: 16
 # native_transport_max_threads: 128
 

[3/5] git commit: Fix typo

[slebresne]

Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a88c6dbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a88c6dbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a88c6dbe

Branch: refs/heads/cassandra-2.0
Commit: a88c6dbe7e7f08d0b320f0354602eb8a3a9779ea
Parents: ddcd54a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 26 17:39:38 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 26 17:45:53 2013 +0200

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a88c6dbe/conf/cassandra.yaml
--
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 651e425..bf6e40d 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -306,7 +306,7 @@ native_transport_port: 9042
 # transport is used. They are similar to rpc_min_threads and rpc_max_threads,
 # though the defaults differ slightly.
 # NOTE: native_transport_min_threads is now deprecated and ignored (but kept
-# in the 1.2.x serie for compatibility sake).
+# in the 1.2.x series for compatibility sake).
 # native_transport_min_threads: 16
 # native_transport_max_threads: 128
 

[2/2] git commit: Fix typo

[slebresne]

Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a88c6dbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a88c6dbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a88c6dbe

Branch: refs/heads/cassandra-2.0.0
Commit: a88c6dbe7e7f08d0b320f0354602eb8a3a9779ea
Parents: ddcd54a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 26 17:39:38 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 26 17:45:53 2013 +0200

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a88c6dbe/conf/cassandra.yaml
--
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 651e425..bf6e40d 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -306,7 +306,7 @@ native_transport_port: 9042
 # transport is used. They are similar to rpc_min_threads and rpc_max_threads,
 # though the defaults differ slightly.
 # NOTE: native_transport_min_threads is now deprecated and ignored (but kept
-# in the 1.2.x serie for compatibility sake).
+# in the 1.2.x series for compatibility sake).
 # native_transport_min_threads: 16
 # native_transport_max_threads: 128
 

[4/6] git commit: Fix typo

[slebresne]

Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a88c6dbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a88c6dbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a88c6dbe

Branch: refs/heads/trunk
Commit: a88c6dbe7e7f08d0b320f0354602eb8a3a9779ea
Parents: ddcd54a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 26 17:39:38 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 26 17:45:53 2013 +0200

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a88c6dbe/conf/cassandra.yaml
--
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 651e425..bf6e40d 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -306,7 +306,7 @@ native_transport_port: 9042
 # transport is used. They are similar to rpc_min_threads and rpc_max_threads,
 # though the defaults differ slightly.
 # NOTE: native_transport_min_threads is now deprecated and ignored (but kept
-# in the 1.2.x serie for compatibility sake).
+# in the 1.2.x series for compatibility sake).
 # native_transport_min_threads: 16
 # native_transport_max_threads: 128
 

[02/15] git commit: Fix typo

[jbellis]

Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/775dcbb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/775dcbb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/775dcbb5

Branch: refs/heads/trunk
Commit: 775dcbb50d99543f87f724e9f1cdb7a7f83554e2
Parents: 02d9238
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 26 17:39:38 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 26 17:39:38 2013 +0200

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/775dcbb5/conf/cassandra.yaml
--
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 28c43ba..d52f2e8 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -343,7 +343,7 @@ native_transport_port: 9042
 # transport is used. They are similar to rpc_min_threads and rpc_max_threads,
 # though the defaults differ slightly.
 # NOTE: native_transport_min_threads is now deprecated and ignored (but kept
-# in the 1.2.x serie for compatibility sake).
+# in the 1.2.x series for compatibility sake).
 # native_transport_min_threads: 16
 # native_transport_max_threads: 128
 

[01/15] git commit: Fix typo

[jbellis]

Updated Branches:
  refs/heads/cassandra-1.2 6164d011e - a4dd7aa39
  refs/heads/cassandra-2.0 5d7e8c8aa - 37c7d2396
  refs/heads/trunk b2930de80 - 300f1a65c


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/775dcbb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/775dcbb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/775dcbb5

Branch: refs/heads/cassandra-2.0
Commit: 775dcbb50d99543f87f724e9f1cdb7a7f83554e2
Parents: 02d9238
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 26 17:39:38 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 26 17:39:38 2013 +0200

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/775dcbb5/conf/cassandra.yaml
--
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 28c43ba..d52f2e8 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -343,7 +343,7 @@ native_transport_port: 9042
 # transport is used. They are similar to rpc_min_threads and rpc_max_threads,
 # though the defaults differ slightly.
 # NOTE: native_transport_min_threads is now deprecated and ignored (but kept
-# in the 1.2.x serie for compatibility sake).
+# in the 1.2.x series for compatibility sake).
 # native_transport_min_threads: 16
 # native_transport_max_threads: 128
 

[02/17] git commit: fix typo

[jbellis]

fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d95cad4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d95cad4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d95cad4

Branch: refs/heads/cassandra-2.0
Commit: 3d95cad4f014deb7868a7cbd816351a6bdfacf32
Parents: 6851c81
Author: Vijay Parthasarathy vijay2...@gmail.com
Authored: Mon Aug 5 19:54:53 2013 -0700
Committer: Vijay Parthasarathy vijay2...@gmail.com
Committed: Mon Aug 5 20:15:50 2013 -0700

--
 src/java/org/apache/cassandra/utils/FBUtilities.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d95cad4/src/java/org/apache/cassandra/utils/FBUtilities.java
--
diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java 
b/src/java/org/apache/cassandra/utils/FBUtilities.java
index e5bd71e..0460eeb 100644
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@ -356,7 +356,7 @@ public class FBUtilities
 }
 if (triggerDir == null || !triggerDir.exists())
 {
-logger.warn(Trigger Directory doesnt exist, please create it and 
try again.);
+logger.warn(Trigger directory doesn't exist, please create it and 
try again.);
 return null;
 }
 return triggerDir;

git commit: fix typo

[vijay]

Updated Branches:
  refs/heads/trunk bf6c3aaba - 913edd650


fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/913edd65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/913edd65
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/913edd65

Branch: refs/heads/trunk
Commit: 913edd65090cf4d38aa8bd3b3966e56fc52caecb
Parents: bf6c3aa
Author: Vijay Parthasarathy vijay2...@gmail.com
Authored: Mon Aug 5 19:54:53 2013 -0700
Committer: Vijay Parthasarathy vijay2...@gmail.com
Committed: Mon Aug 5 19:54:53 2013 -0700

--
 src/java/org/apache/cassandra/utils/FBUtilities.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/913edd65/src/java/org/apache/cassandra/utils/FBUtilities.java
--
diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java 
b/src/java/org/apache/cassandra/utils/FBUtilities.java
index e5bd71e..0460eeb 100644
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@ -356,7 +356,7 @@ public class FBUtilities
 }
 if (triggerDir == null || !triggerDir.exists())
 {
-logger.warn(Trigger Directory doesnt exist, please create it and 
try again.);
+logger.warn(Trigger directory doesn't exist, please create it and 
try again.);
 return null;
 }
 return triggerDir;

[2/2] git commit: fix typo

[vijay]

fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d95cad4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d95cad4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d95cad4

Branch: refs/heads/cassandra-2.0.0
Commit: 3d95cad4f014deb7868a7cbd816351a6bdfacf32
Parents: 6851c81
Author: Vijay Parthasarathy vijay2...@gmail.com
Authored: Mon Aug 5 19:54:53 2013 -0700
Committer: Vijay Parthasarathy vijay2...@gmail.com
Committed: Mon Aug 5 20:15:50 2013 -0700

--
 src/java/org/apache/cassandra/utils/FBUtilities.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d95cad4/src/java/org/apache/cassandra/utils/FBUtilities.java
--
diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java 
b/src/java/org/apache/cassandra/utils/FBUtilities.java
index e5bd71e..0460eeb 100644
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@ -356,7 +356,7 @@ public class FBUtilities
 }
 if (triggerDir == null || !triggerDir.exists())
 {
-logger.warn(Trigger Directory doesnt exist, please create it and 
try again.);
+logger.warn(Trigger directory doesn't exist, please create it and 
try again.);
 return null;
 }
 return triggerDir;

[2/3] git commit: fix typo

[vijay]

fix typo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d95cad4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d95cad4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d95cad4

Branch: refs/heads/trunk
Commit: 3d95cad4f014deb7868a7cbd816351a6bdfacf32
Parents: 6851c81
Author: Vijay Parthasarathy vijay2...@gmail.com
Authored: Mon Aug 5 19:54:53 2013 -0700
Committer: Vijay Parthasarathy vijay2...@gmail.com
Committed: Mon Aug 5 20:15:50 2013 -0700

--
 src/java/org/apache/cassandra/utils/FBUtilities.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d95cad4/src/java/org/apache/cassandra/utils/FBUtilities.java
--
diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java 
b/src/java/org/apache/cassandra/utils/FBUtilities.java
index e5bd71e..0460eeb 100644
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@ -356,7 +356,7 @@ public class FBUtilities
 }
 if (triggerDir == null || !triggerDir.exists())
 {
-logger.warn(Trigger Directory doesnt exist, please create it and 
try again.);
+logger.warn(Trigger directory doesn't exist, please create it and 
try again.);
 return null;
 }
 return triggerDir;

git commit: Fix typo in CQL doc

[slebresne]

Updated Branches:
  refs/heads/cassandra-1.2 e301c38d3 - 6850cdc3e


Fix typo in CQL doc


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6850cdc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6850cdc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6850cdc3

Branch: refs/heads/cassandra-1.2
Commit: 6850cdc3ed9ea15fecc13beea093012c124f8b8c
Parents: e301c38
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Jun 6 12:16:28 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Jun 6 12:16:28 2013 +0200

--
 doc/cql3/CQL.textile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6850cdc3/doc/cql3/CQL.textile
--
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 059342e..13b6f70 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -976,9 +976,9 @@ CQL distinguishes between _reserved_ and _non-reserved_ 
keywords. Reserved keywo
 | @BOOLEAN@  | no  |
 | @BY@   | yes |
 | @CLUSTERING@   | no  |
-| @COLUMNFAMLY@  | yes |
+| @COLUMNFAMILY@ | yes |
 | @COMPACT@  | no  |
-| @CONSITENCY@   | no  |
+| @CONSISTENCY@  | no  |
 | @COUNT@| no  |
 | @COUNTER@  | no  |
 | @CREATE@   | yes |

[2/4] git commit: Fix typo in CQL doc

[brandonwilliams]

Fix typo in CQL doc


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6850cdc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6850cdc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6850cdc3

Branch: refs/heads/trunk
Commit: 6850cdc3ed9ea15fecc13beea093012c124f8b8c
Parents: e301c38
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Jun 6 12:16:28 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Jun 6 12:16:28 2013 +0200

--
 doc/cql3/CQL.textile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6850cdc3/doc/cql3/CQL.textile
--
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 059342e..13b6f70 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -976,9 +976,9 @@ CQL distinguishes between _reserved_ and _non-reserved_ 
keywords. Reserved keywo
 | @BOOLEAN@  | no  |
 | @BY@   | yes |
 | @CLUSTERING@   | no  |
-| @COLUMNFAMLY@  | yes |
+| @COLUMNFAMILY@ | yes |
 | @COMPACT@  | no  |
-| @CONSITENCY@   | no  |
+| @CONSISTENCY@  | no  |
 | @COUNT@| no  |
 | @COUNTER@  | no  |
 | @CREATE@   | yes |