Merge branch 'cassandra-3.0' into cassandra-3.3
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a31958b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a31958b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a31958b
Branch: refs/heads/trunk
Commit: 1a31958bfa2adb04ec965e6e2776862eee30ecf4
Parents: 5956000 414c1c5
Author: Tyler Hobbs <tylerlho...@gmail.com>
Authored: Wed Jan 27 14:36:37 2016 -0600
Committer: Tyler Hobbs <tylerlho...@gmail.com>
Committed: Wed Jan 27 14:36:37 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
bin/cqlsh.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a31958b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c78dd10,1a1abc0..f9af204
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,6 +1,8 @@@
-3.0.3
+3.3
+ * Avoid bootstrap hanging when existing nodes have no data to stream
(CASSANDRA-11010)
+Merged from 3.0:
+ * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
+ (CASSANDRA-11003)
* Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762)
* Migrate build status for indexes along with legacy schema (CASSANDRA-11046)
* Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a31958b/bin/cqlsh.py
----------------------------------------------------------------------
