Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Mikhail Stepura 2014-03-18 21:15:56 -07:00
commit 3acba5bbad
1 changed files with 1 additions and 1 deletions

View File

@ -91,7 +91,7 @@ futures_zip = find_zip(FUTURES_LIB_PREFIX)
if futures_zip:
sys.path.insert(0, futures_zip)
warnings.filterwarnings("ignore", r".*blist.*")
try:
import cassandra
except ImportError, e: