Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f580fb0f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f580fb0f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f580fb0f Branch: refs/heads/trunk Commit: f580fb0ff2b2356f25839ad328833c11a7a8eed2 Parents: 89a645a 886f875 Author: T Jake Luciani <j...@apache.org> Authored: Fri May 6 09:11:06 2016 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Fri May 6 09:11:06 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 + build.xml | 2 +- lib/cassandra-driver-core-3.0.0-shaded.jar | Bin 2433676 -> 0 bytes lib/cassandra-driver-core-3.0.1-shaded.jar | Bin 0 -> 2445093 bytes lib/licenses/cassandra-driver-3.0.0.txt | 177 ------------------------ lib/licenses/cassandra-driver-3.0.1.txt | 177 ++++++++++++++++++++++++ 6 files changed, 181 insertions(+), 178 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f580fb0f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ba64a19,ff98d48..c6b0af5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,7 +1,12 @@@ +3.8 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + + 3.7 + Merged from 3.0: + * Refactor Materialized View code (CASSANDRA-11475) + * Update Java Driver (CASSANDRA-11615) Merged from 2.2: * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f580fb0f/build.xml ----------------------------------------------------------------------
