Merge branch 'cassandra-2.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/713b7db2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/713b7db2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/713b7db2 Branch: refs/heads/trunk Commit: 713b7db2240863c4e6277d98356f827b1d1f668e Parents: 9307546 c08aaab Author: Robert Stupp <sn...@snazy.de> Authored: Thu Jun 11 10:18:39 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Thu Jun 11 10:18:39 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 7 + doc/cql3/CQL.textile | 17 +- .../cassandra/cql3/functions/Functions.java | 17 +- .../cassandra/cql3/functions/TimeFcts.java | 229 +++++++++++++++++++ .../cassandra/cql3/functions/TimeuuidFcts.java | 88 ------- .../cassandra/db/marshal/SimpleDateType.java | 10 + .../cassandra/db/marshal/TimestampType.java | 5 + .../repair/SystemDistributedKeyspace.java | 12 +- .../serializers/SimpleDateSerializer.java | 18 +- .../apache/cassandra/cql3/AggregationTest.java | 12 +- .../org/apache/cassandra/cql3/TypeTest.java | 9 +- test/unit/org/apache/cassandra/cql3/UFTest.java | 10 +- .../cassandra/cql3/functions/TimeFctsTest.java | 206 +++++++++++++++++ 14 files changed, 523 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/713b7db2/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/713b7db2/NEWS.txt ----------------------------------------------------------------------
