diff --git a/.build/build-resolver.xml b/.build/build-resolver.xml index f17ad23396..c38a272fe1 100644 --- a/.build/build-resolver.xml +++ b/.build/build-resolver.xml @@ -201,6 +201,7 @@ + @@ -231,6 +232,7 @@ + diff --git a/bin/cqlsh.py b/bin/cqlsh.py index 637c95e70a..6c1e7bd4fc 100755 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -113,7 +113,7 @@ if cql_zip: sys.path.insert(0, os.path.join(cql_zip, 'cassandra-driver-' + ver)) # the driver needs dependencies -third_parties = ('six-', 'puresasl-') +third_parties = ('six-', 'pure_sasl-') for lib in third_parties: lib_zip = find_zip(lib) diff --git a/build.xml b/build.xml index a620f32a13..62048192d3 100644 --- a/build.xml +++ b/build.xml @@ -1335,10 +1335,9 @@ - + - diff --git a/lib/puresasl-internal-only-0.6.2.zip b/lib/puresasl-internal-only-0.6.2.zip deleted file mode 100644 index 8314a045f6..0000000000 Binary files a/lib/puresasl-internal-only-0.6.2.zip and /dev/null differ