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/trunk
Commit: a7b32deb9583817b7972711cc33884d86fd52397
Parents: b38bec7 fc9b3a7
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Wed Sep 18 14:29:53 2013 +0200
Committer: Sylvain Lebresne <sylv...@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
----------------------------------------------------------------------

Reply via email to