You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/09 09:58:15 UTC

[1/6] git commit: typo

Updated Branches:
  refs/heads/cassandra-1.2 b5f4d03d0 -> 30f5e5613
  refs/heads/cassandra-2.0 b248b1ae3 -> ce9d3030b
  refs/heads/trunk 5fd463184 -> 3b8690db5


typo


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

Branch: refs/heads/cassandra-1.2
Commit: 30f5e561312ef7359d9a8ad0c3803e0ae150a4b7
Parents: b5f4d03
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 9 08:57:02 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 9 08:57:02 2013 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/30f5e561/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 f3cea48..dbc9577 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -233,7 +233,7 @@ public class QueryProcessor
         if (statement instanceof CFStatement)
             ((CFStatement)statement).prepareKeyspace(clientState);
 
-        Tracing.trace("Peparing statement");
+        Tracing.trace("Preparing statement");
         return statement.prepare();
     }

[3/6] git commit: typo

Posted by jb...@apache.org.
typo


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

Branch: refs/heads/trunk
Commit: 30f5e561312ef7359d9a8ad0c3803e0ae150a4b7
Parents: b5f4d03
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 9 08:57:02 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 9 08:57:02 2013 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/30f5e561/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 f3cea48..dbc9577 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -233,7 +233,7 @@ public class QueryProcessor
         if (statement instanceof CFStatement)
             ((CFStatement)statement).prepareKeyspace(clientState);
 
-        Tracing.trace("Peparing statement");
+        Tracing.trace("Preparing statement");
         return statement.prepare();
     }

[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: ce9d3030b876283f8b1e5d376f6238ec524ee6b8
Parents: b248b1a 30f5e56
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 9 08:57:09 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 9 08:57:09 2013 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce9d3030/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------

[2/6] git commit: typo

Posted by jb...@apache.org.
typo


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

Branch: refs/heads/cassandra-2.0
Commit: 30f5e561312ef7359d9a8ad0c3803e0ae150a4b7
Parents: b5f4d03
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 9 08:57:02 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 9 08:57:02 2013 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/30f5e561/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 f3cea48..dbc9577 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -233,7 +233,7 @@ public class QueryProcessor
         if (statement instanceof CFStatement)
             ((CFStatement)statement).prepareKeyspace(clientState);
 
-        Tracing.trace("Peparing statement");
+        Tracing.trace("Preparing statement");
         return statement.prepare();
     }

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 3b8690db5e78e3c8bec6f07a2c9a151212412a70
Parents: 5fd4631 ce9d303
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 9 08:57:52 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 9 08:57:52 2013 +0100

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

[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/cassandra-2.0
Commit: ce9d3030b876283f8b1e5d376f6238ec524ee6b8
Parents: b248b1a 30f5e56
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 9 08:57:09 2013 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 9 08:57:09 2013 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce9d3030/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------