Merge branch 'cassandra-2.1' into trunk
Conflicts:
test/system/test_thrift_server.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb8ce832
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb8ce832
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb8ce832
Branch: refs/heads/cassandra-2.1
Commit: cb8ce83257c0f90e7b338bf16064142d571f0132
Parents: 755d345 334969f
Author: Aleksey Yeschenko <[email protected]>
Authored: Tue Aug 12 00:18:54 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Tue Aug 12 00:18:54 2014 +0300
----------------------------------------------------------------------
test/system/__init__.py | 184 ---
test/system/test_thrift_server.py | 2113 --------------------------------
2 files changed, 2297 deletions(-)
----------------------------------------------------------------------
