Tyler Hobbs 567655c6b0 Merge branch 'master' into 2.0 ...

Conflicts:
	cassandra/cluster.py
	cassandra/io/asyncorereactor.py
	cassandra/io/libevreactor.py
	tests/integration/__init__.py
	tests/integration/standard/test_cluster.py
	tests/integration/standard/test_connection.py
	tests/unit/test_connection.py

2014-04-02 16:17:36 -05:00

..

io

Merge branch 'master' into gevent

2014-03-12 18:24:02 -05:00

__init__.py

Merge branch 'master' into 2.0

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

cluster.py

Merge branch 'master' into 2.0

2014-04-02 16:17:36 -05:00

connection.py

Merge branch 'master' into 2.0

2014-04-02 16:17:36 -05:00

cqltypes.py

Merge branch 'master' into 2.0

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

decoder.py

First steps towards auto paging support

2014-03-19 17:14:11 -05: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-04-02 16:17:36 -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 adding hosts to load balancing policy without DC/rack info

2014-03-19 18:00:59 -05:00

pool.py

Merge branch 'master' into 2.0

2014-04-02 16:17:36 -05:00

query.py

Merge branch 'master' into 2.0

2014-04-02 16:17:36 -05:00

util.py

Handle OrderedDict import attempt in cassandra.util

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