Tests for CASSANDRA-6839
Add test coverage for IN operator on column conditions
Accept null values in element access column conditions

Done for CASSANDRA-6839
user functions test
add .iml files
review changes
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/riptano/cassandra-dtest

Conflicts:
	user_functions.py
Merge branch 'master' into CASSANDRA-6839
More complete testing for collection conditions
Share connection across threads
Check for same exception as we did with dbapi2
Revert "Check for same exception as we did with dbapi2"

This reverts commit 082fc30009538f6f4f9bf29d4a6a700c51dfc499.
Convert num_tokens to int before comparison

NUM_TOKENS defaults to '256', so it was failing the assert
comparison to 256. The assert function used was also changed
so that the debug output is more useful in the future.
Convert num_tokens to int before comparison

NUM_TOKENS defaults to '256', so it was failing the assert
comparison to 256. The assert function used was also changed
so that the debug output is more useful in the future.
Remove attempted workaround for driver error

Paging is no longer attempted on this query
Added test for CASSANDRA-7831
Merge branch 'master' into python-driver
Set initial_token for thrift_tests

Conflicts:
	thrift_tests.py
Remove path for testing 1.1