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-03-12 17:43:58 -05:00

__init__.py

Merge branch 'master' into 2.0

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

cluster.py

Silence control conn errors around shutdown

2014-03-06 19:00:15 -06:00

connection.py

Add protocol_version attr to Cluster, use in conns

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

cqltypes.py

Merge branch 'master' into 2.0

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

decoder.py

Merge branch 'master' into 2.0

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

encoder.py

Move encoders from decoder.py to encoder.py

2014-02-28 15:30:24 -06:00

marshal.py

Minor PEP-8 fixes

2014-01-09 09:40:46 -06:00

metadata.py

Merge branch 'master' into 2.0

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

metrics.py

Minor PEP-8 fixes

2014-01-09 09:40:46 -06:00

murmur3.c

Use Py_ssize_t for murmur3 key len

2013-11-22 13:28:59 -06:00

policies.py

Avoid changing set size during iter in query plan generation

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

pool.py

Add version field, setter to Host

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

query.py

Bind non-prepared batch subqueries client-side

2014-03-06 16:55:52 -06:00

util.py

Handle OrderedDict import attempt in cassandra.util

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