You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/11 03:11:51 UTC
[18/18] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5205ce66
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5205ce66
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5205ce66
Branch: refs/heads/trunk
Commit: 5205ce669fd43560cd8c6cf4f9c13b665fb34121
Parents: 25411bf f2f2d47
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 11 01:08:53 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 11 01:08:53 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 4 +-
NEWS.txt | 5 +-
build.xml | 2 +-
debian/changelog | 6 ++
.../cql3/functions/BytesConversionFcts.java | 22 ++++-
.../cassandra/cql3/functions/FunctionCall.java | 23 ++++-
.../apache/cassandra/db/RangeTombstoneList.java | 79 +++++++++++++++---
.../cassandra/hadoop/pig/CqlNativeStorage.java | 17 ++++
test/system/test_thrift_server.py | 49 +++++------
.../cassandra/db/RangeTombstoneListTest.java | 88 ++++++++++++++++++++
10 files changed, 247 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5205ce66/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5205ce66/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5205ce66/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5205ce66/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5205ce66/test/system/test_thrift_server.py
----------------------------------------------------------------------