Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c348c42 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c348c42 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c348c42 Branch: refs/heads/trunk Commit: 4c348c422153180dd08ed9b9e04e4f0bbfa27043 Parents: 1527fab b72af48 Author: Sylvain Lebresne <[email protected]> Authored: Wed Mar 27 16:18:44 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Mar 27 16:18:44 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/CQL3Type.java | 32 +++++++++++++++ src/java/org/apache/cassandra/cql3/TypeCast.java | 2 +- .../cassandra/cql3/functions/FunctionCall.java | 2 +- .../apache/cassandra/cql3/functions/Functions.java | 4 +- .../cassandra/cql3/statements/Selection.java | 2 +- .../apache/cassandra/db/marshal/ReversedType.java | 7 +++ 7 files changed, 45 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c348c42/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c348c42/src/java/org/apache/cassandra/cql3/statements/Selection.java ----------------------------------------------------------------------
