Adam Holmberg 264fab97ef Merge branch '3.0' ...

Conflicts:
	cassandra/metadata.py
	tests/integration/__init__.py
	tests/integration/standard/test_metadata.py

2015-05-15 14:56:59 -05:00

..

cqlengine

Deprecate cqlengine.Float(double_precision=True)

2015-04-20 16:50:33 -05:00

io

Revert "Merge pull request #298 from datastax/PYTHON-108"

2015-05-15 14:46:06 -05:00

__init__.py

Merge branch '3.0'

2015-05-15 14:56:59 -05:00

auth.py

Merge branch '3.0'

2015-05-15 14:56:59 -05:00

cluster.py

Merge branch '3.0'

2015-05-15 14:56:59 -05:00

concurrent.py

Update copyright in core files

2015-02-10 12:02:01 -06:00

connection.py

Revert "Merge pull request #298 from datastax/PYTHON-108"

2015-05-15 14:46:06 -05:00

cqltypes.py

Evict cached UDT class when new type is registered.

2015-03-23 10:52:40 -05:00

decoder.py

Update copyright in core files

2015-02-10 12:02:01 -06:00

encoder.py

Add OrderedMapSerializedKey to cql encoder mapping

2015-04-16 09:23:45 -05:00

marshal.py

Update copyright in core files

2015-02-10 12:02:01 -06:00

metadata.py

Merge branch '3.0'

2015-05-15 14:56:59 -05:00

metrics.py

Update copyright in core files

2015-02-10 12:02:01 -06:00

murmur3.c

Make MM3 hash match C*'s hash for all values

2014-07-09 14:55:14 -05:00

policies.py

Merge bugfix relase branch 2.5.1 back to working master

2015-04-23 19:37:41 -05:00

pool.py

Merge branch 'cqlengine-integration'

2015-03-17 10:54:31 -05:00

protocol.py

length validation for custom payload map

2015-05-12 09:06:22 -05:00

query.py

Merge branch '3.0'

2015-05-15 14:56:59 -05:00

util.py

Expand code doc for util.Date, util.Time

2015-03-24 16:04:39 -05:00