Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50f8ac05 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50f8ac05 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50f8ac05 Branch: refs/heads/trunk Commit: 50f8ac051a05cf127cb605d8fb9eb4cf232aab33 Parents: 3f2a2b3 66c185d Author: Robert Stupp <[email protected]> Authored: Tue Sep 29 13:24:38 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Tue Sep 29 13:24:38 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 5 +++++ bin/cqlsh.py | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50f8ac05/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index cd69baf,b3b1cdd..303c403 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,8 +1,12 @@@ +3.2 + * Add transparent data encryption core classes (CASSANDRA-9945) + + + 3.0 + Merged from 2.2: + * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369) + + 3.0.0-rc1 * Fix mixed version read request compatibility for compact static tables (CASSANDRA-10373)
