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

..

integration

Merge branch '3.0'

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

unit

Merge branch '3.0'

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

__init__.py

Update copyright in core files

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