Tyler Hobbs 17998ef72a Merge branch '2.0' into del-and-daemon-thread-cleanup ...

Conflicts:
	cassandra/cluster.py
	cassandra/connection.py
	cassandra/io/asyncorereactor.py
	cassandra/io/libevreactor.py

2014-04-16 15:20:46 -05:00

..

io

Merge branch '2.0' into del-and-daemon-thread-cleanup

2014-04-16 15:20:46 -05:00

__init__.py

Add License headers

2014-04-16 08:14:24 -07:00

cluster.py

Merge branch '2.0' into del-and-daemon-thread-cleanup

2014-04-16 15:20:46 -05:00

concurrent.py

Handle iterators in execute_concurrent

2014-04-16 11:28:23 -05:00

connection.py

Merge branch '2.0' into del-and-daemon-thread-cleanup

2014-04-16 15:20:46 -05:00

cqltypes.py

Add License headers

2014-04-16 08:14:24 -07:00

decoder.py

Add License headers

2014-04-16 08:14:24 -07:00

encoder.py

Add License headers

2014-04-16 08:14:24 -07:00

marshal.py

Add License headers

2014-04-16 08:14:24 -07:00

metadata.py

Add License headers

2014-04-16 08:14:24 -07:00

metrics.py

Add License headers

2014-04-16 08:14:24 -07:00

murmur3.c

Use Py_ssize_t for murmur3 key len

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

policies.py

Add License headers

2014-04-16 08:14:24 -07:00

pool.py

Merge branch 'master' into 2.0

2014-04-16 15:13:19 -05:00

query.py

Merge branch 'master' into 2.0

2014-04-16 15:13:19 -05:00

util.py

Handle OrderedDict import attempt in cassandra.util

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