Tyler Hobbs fd4f08e7ee Merge branch '1.x' ...

Conflicts:
	CHANGELOG.rst
	cassandra/decoder.py

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

..

io

Add 1 second timeout to event loop thread join()

2014-05-13 11:06:33 -05:00

__init__.py

Make version 1.1.2.post

2014-05-08 16:21:04 -05:00

cluster.py

Merge branch '1.x'

2014-05-09 17:17:41 -05:00

concurrent.py

Minor fixes to cassandra.concurrent docs

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

connection.py

Use six.string_types instead of basestring

2014-05-07 17:27:35 -05:00

cqltypes.py

Merge branch 'py3k' into 2.0

2014-05-02 15:55:35 -05:00

decoder.py

Pass WriteType, not str to RetryPolicy.on_write_timeout

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

encoder.py

Merge branch 'py3k' into 2.0

2014-05-02 15:55:35 -05:00

marshal.py

Merge branch 'py3k' into 2.0

2014-05-02 15:55:35 -05:00

metadata.py

Ensure datacenter rf is an int for NTS

2014-05-14 11:09:23 -05:00

metrics.py

Make scales, blist optional dependencies

2014-05-07 10:46:00 -05: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 '1.x'

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

pool.py

Merge branch 'master' into 2.0

2014-05-06 13:57:06 -05:00

protocol.py

Merge branch '1.x'

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

query.py

Merge branch '1.x'

2014-05-09 17:17:41 -05:00

util.py

Replace .next() calls with next() function

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