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/11 08:36:34 UTC

[4/4] git commit: Merge branch 'cassandra-2.0' into trunk

Merge branch 'cassandra-2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/972184bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/972184bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/972184bf

Branch: refs/heads/trunk
Commit: 972184bf750c0340f6ca2a13ee39347d173b5e79
Parents: 0132b71 2c84b14
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Sep 11 08:36:21 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Sep 11 08:36:21 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 src/java/org/apache/cassandra/cql3/Cql.g        |  2 +-
 .../cassandra/cql3/functions/TimeuuidFcts.java  | 24 ++++++++++++++++----
 .../cassandra/cql3/functions/TokenFct.java      |  7 +++++-
 4 files changed, 29 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/972184bf/CHANGES.txt
----------------------------------------------------------------------