You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/09/18 14:30:00 UTC
[1/2] git commit: Fix typo
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 <sy...@datastax.com>
Authored: Wed Sep 18 14:27:18 2013 +0200
Committer: Sylvain Lebresne <sy...@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();
}
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@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/a7b32deb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7b32deb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7b32deb
Branch: refs/heads/cassandra-2.0
Commit: a7b32deb9583817b7972711cc33884d86fd52397
Parents: b38bec7 fc9b3a7
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Sep 18 14:29:53 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Sep 18 14:29:53 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/a7b32deb/src/java/org/apache/cassandra/cql3/CQL3Type.java
----------------------------------------------------------------------