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
Use assert function instead of execute

Judging by parameters, appears to have been a merge mistake.
An assert should have been used instead of the execute.
Test for 6839 should require 2.1.1

6839 was not merged into 2.1.0. Changing the since to be 2.1.1
Test for 6839 should require 2.1.1

6839 was not merged into 2.1.0. Changing the since to be 2.1.1
Use assert function instead of execute

Judging by parameters, appears to have been a merge mistake.
An assert should have been used instead of the execute.
Handle token checks without vnodes
Merge branch 'master' into python-driver
Make corrections for CASSANDRA-6974
Correct typo
Remove all snapshot dirs
Move cleanup into finally block
Merge pull request #87 from riptano/fix_7846

Make corrections for CASSANDRA-6974
Add frozen keyword for CASSANDRA-7857
Add frozen keyword for CASSANDRA-7857
Updated udtenencoding_test for frozen keyword
cql_tests fixes