Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
.rat-excludes
CHANGES.txt
build.xml
debian/changelog
test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithStaticColumnsPresentTest.java
test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f75ee846
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f75ee846
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f75ee846
Branch: refs/heads/trunk
Commit: f75ee846f8fdf552a2b6733ec6cb79742174c6db
Parents: d93b851 b3bb7fc
Author: Sylvain Lebresne <[email protected]>
Authored: Sat Aug 9 13:42:10 2014 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Sat Aug 9 13:42:10 2014 +0200
----------------------------------------------------------------------
test/system/test_thrift_server.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
