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/b2a949ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2a949ec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2a949ec Branch: refs/heads/trunk Commit: b2a949ecda7d54f981a39af1b5aac8f50c0a88f9 Parents: 0b20e13 b82027c Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Apr 2 19:23:48 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Apr 2 19:23:48 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/cql3/functions/FunctionCall.java | 6 +++++- .../cassandra/cql3/statements/Selection.java | 2 ++ 3 files changed, 8 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2a949ec/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2a949ec/src/java/org/apache/cassandra/cql3/statements/Selection.java ----------------------------------------------------------------------
