Tyler Hobbs 9d4c7842c1 Merge branch '2.0' into py3k ...

Conflicts:
	cassandra/cluster.py
	cassandra/connection.py
	cassandra/io/asyncorereactor.py
	cassandra/io/libevreactor.py
	setup.py
	tests/integration/long/test_large_data.py

2014-04-03 17:45:53 -05:00

..

io

Merge branch '2.0' into py3k

2014-04-03 17:45:53 -05:00

__init__.py

Merge branch 'master' into 2.0

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

cluster.py

Merge branch '2.0' into py3k

2014-04-03 17:45:53 -05:00

concurrent.py

Add methods for concurrent execution

2014-04-03 16:44:08 -05:00

connection.py

Merge branch '2.0' into py3k

2014-04-03 17:45:53 -05:00

cqltypes.py

Change approach to adding a metaclass to six.add_metaclass, update metaclasses to not look for NewBase

2014-03-21 11:33:23 +11:00

decoder.py

Server has a valid error code of 0

2014-03-22 10:55:12 +11:00

encoder.py

Add comments to more explicitly state the process in cql_quote

2014-03-22 11:19:56 +11:00

marshal.py

Remove un-used methods

2014-03-22 11:10:10 +11:00

metadata.py

Merge branch '2.0' into py3k

2014-04-03 17:45:53 -05:00

metrics.py

Minor PEP-8 fixes

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

murmur3.c

Updated murmur3 c extension to work with Python 3. Changed murmur3 import to be absolute.

2014-03-22 01:07:21 +11:00

policies.py

Merge branch '2.0' into py3k

2014-04-03 17:45:53 -05:00

pool.py

Merge branch '2.0' into py3k

2014-04-03 17:45:53 -05:00

query.py

Merge branch '2.0' into py3k

2014-04-03 17:45:53 -05:00

util.py

Update to use six.moves for simplify import of libraries that have moved. All tests passing for pythons other than 3

2014-03-17 01:47:48 +11:00