Tyler Hobbs e5457cbad8 Merge branch 'py3k' into 2.0 ...

Conflicts:
	cassandra/cluster.py
	cassandra/encoder.py
	cassandra/marshal.py
	cassandra/pool.py
	setup.py
	tests/integration/long/test_large_data.py
	tests/integration/long/utils.py
	tests/integration/standard/test_metadata.py
	tests/integration/standard/test_prepared_statements.py
	tests/unit/io/test_asyncorereactor.py
	tests/unit/test_connection.py
	tests/unit/test_types.py

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

..

base.py

Merge branch 'py3k' into 2.0

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

callback_full_pipeline.py

Merge branch 'py3k' into 2.0

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

future_batches.py

Merge branch 'py3k' into 2.0

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

future_full_pipeline.py

Merge branch 'py3k' into 2.0

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

future_full_throttle.py

Merge branch 'py3k' into 2.0

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

sync.py

Merge branch 'py3k' into 2.0

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