Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92688209 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92688209 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92688209 Branch: refs/heads/trunk Commit: 9268820952706755d74b97e6f3da4e0b39b8f164 Parents: 7484789 a771f60 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Aug 11 00:40:16 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Aug 11 00:40:16 2014 +0300 ---------------------------------------------------------------------- test/system/test_thrift_server.py | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
