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/c1332890 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1332890 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1332890 Branch: refs/heads/trunk Commit: c1332890aaca219c18e2d770ff9e356622920f8f Parents: 4b9f1e2 b853630 Author: Sylvain Lebresne <[email protected]> Authored: Wed Jun 5 20:06:41 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Jun 5 20:06:41 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/cql3/functions/AbstractFunction.java | 6 ++++++ .../apache/cassandra/cql3/functions/Function.java | 3 +++ .../cassandra/cql3/functions/FunctionCall.java | 4 +++- .../cassandra/cql3/functions/TimeuuidFcts.java | 6 ++++++ 5 files changed, 19 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1332890/CHANGES.txt ----------------------------------------------------------------------
