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
..
2015-04-20 16:50:33 -05:00
2015-05-15 14:46:06 -05:00
2015-05-15 14:56:59 -05:00
2015-05-15 14:56:59 -05:00
2015-05-15 14:56:59 -05:00
2015-02-10 12:02:01 -06:00
2015-05-15 14:46:06 -05:00
2015-03-23 10:52:40 -05:00
2015-02-10 12:02:01 -06:00
2015-04-16 09:23:45 -05:00
2015-02-10 12:02:01 -06:00
2015-05-15 14:56:59 -05:00
2015-02-10 12:02:01 -06:00
2014-07-09 14:55:14 -05:00
2015-04-23 19:37:41 -05:00
2015-03-17 10:54:31 -05:00
2015-05-12 09:06:22 -05:00
2015-05-15 14:56:59 -05:00
2015-03-24 16:04:39 -05:00