diff --git a/.build/build-resolver.xml b/.build/build-resolver.xml index f536dda1f1..793937ddf0 100644 --- a/.build/build-resolver.xml +++ b/.build/build-resolver.xml @@ -202,11 +202,6 @@ - - - - - @@ -237,7 +232,6 @@ - diff --git a/.gitignore b/.gitignore index 36d8d22034..8754b17f60 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ data/ conf/hotspot_compiler doc/cql3/CQL.html lib/ +!lib/cassandra-driver-internal-only-*.zip # C* debs build-stamp diff --git a/CHANGES.txt b/CHANGES.txt index efd6c60556..6dd8bab086 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0-rc1 + * Add back the source release of python driver in tree to avoid fetching from GitHub APIs (CASSANDRA-16599) * Fix false unavailable for queries due to cluster topology changes (CASSANDRA-16545) * Fixed a race condition issue in nodetool repair where we poll for the error before seeing the error notification, leading to a less meaningful message (CASSANDRA-16585) * Fix mixed cluster GROUP BY queries (CASSANDRA-16582) diff --git a/build.xml b/build.xml index 31c1fe9cfe..2fddbb0016 100644 --- a/build.xml +++ b/build.xml @@ -377,7 +377,9 @@ - + + + diff --git a/lib/cassandra-driver-internal-only-3.25.0.zip b/lib/cassandra-driver-internal-only-3.25.0.zip new file mode 100644 index 0000000000..ecfd6a946e Binary files /dev/null and b/lib/cassandra-driver-internal-only-3.25.0.zip differ