Tyler Hobbs 562e2d4e4a Merge branch 'master' into 2.0 ...

Conflicts:
	cassandra/cluster.py
	tests/integration/__init__.py
	tests/unit/test_control_connection.py

2014-03-12 17:43:58 -05:00

..

io

Merge branch 'master' into 2.0

2014-02-28 13:16:43 -06:00

__init__.py

Split tests into unit and integration tests

2013-05-21 10:59:51 -05:00

test_connection.py

Add protocol_version attr to Cluster, use in conns

2014-02-13 18:52:16 -06:00

test_control_connection.py

Update missed unit test

2014-03-06 19:07:07 -06:00

test_host_connection_pool.py

Add version field, setter to Host

2014-02-13 18:13:46 -06:00

test_marshalling.py

Handle OrderedDict import attempt in cassandra.util

2014-02-28 15:27:07 -06:00

test_metadata.py

Lowercase boolean literals when generating schemas

2014-03-07 12:13:25 -06:00

test_parameter_binding.py

Handle OrderedDict import attempt in cassandra.util

2014-02-28 15:27:07 -06:00

test_policies.py

Avoid changing set size during iter in query plan generation

2014-02-28 13:02:30 -06:00

test_response_future.py

Switch from class-level params to init args

2014-03-06 12:50:11 -06:00

test_types.py

Merge branch 'master' into 2.0

2014-03-06 18:33:16 -06:00