Tyler Hobbs 4c82e99d8b Merge branch 'master' into 2.1-support ...

Conflicts:
	cassandra/protocol.py

2014-06-17 11:57:02 -05:00

..

io

Merge branch 'master' into 2.1-support

2014-06-17 11:57:02 -05:00

__init__.py

Make version 2.0.2.post

2014-06-10 16:25:00 -05:00

auth.py

Support v2 protocol authentication

2014-05-23 14:28:44 -05:00

cluster.py

Merge branch 'master' into 2.1-support

2014-06-17 11:57:02 -05:00

concurrent.py

Minor fixes to cassandra.concurrent docs

2014-05-14 16:54:02 -05:00

connection.py

Merge branch 'master' into 2.1-support

2014-06-17 11:57:02 -05:00

cqltypes.py

Use v3 collection serialization inside UDTs

2014-05-28 17:59:55 -05:00

decoder.py

Pass WriteType, not str to RetryPolicy.on_write_timeout

2014-05-20 13:32:58 -05:00

encoder.py

Add blist.sortedset to cql encoders

2014-05-26 14:03:07 +03:00

marshal.py

2 byte request IDs + queue-less req ID management

2014-05-30 15:41:06 -05:00

metadata.py

Avoid KeyError in schema refresh when dropping keyspaces

2014-05-30 16:50:05 -05:00

metrics.py

Various doc fixes

2014-05-28 14:10:39 -05:00

murmur3.c

Fix mixed declarations and statements.

2014-05-22 10:02:53 -05:00

policies.py

Merge branch '1.x'

2014-05-20 13:44:36 -05:00

pool.py

2 byte request IDs + queue-less req ID management

2014-05-30 15:41:06 -05:00

protocol.py

Merge branch 'master' into 2.1-support

2014-06-17 11:57:02 -05:00

query.py

Merge branch 'master' into 2.1-support

2014-06-17 11:57:02 -05:00

util.py

Replace .next() calls with next() function

2014-04-04 14:00:22 -05:00