Aleksey Yeschenko 37f0c8c91f Merge branch 'cassandra-1.2' into trunk ... Conflicts: test/system/test_thrift_server.py		2013-06-02 02:32:10 +03:00
..
__init__.py	Ninja-unify 1.1/1.2/2.0 system tests	2013-05-06 01:56:43 +03:00
test_thrift_server.py	Merge branch 'cassandra-1.2' into trunk	2013-06-02 02:32:10 +03:00