You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2016/12/12 12:53:35 UTC
[3/4] cassandra git commit: Merge branch cassandra-3.0 into
cassandra-3.11
Merge branch cassandra-3.0 into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c80b9fb3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c80b9fb3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c80b9fb3
Branch: refs/heads/cassandra-3.X
Commit: c80b9fb395671411f1be53b607d7c384f4b37798
Parents: 4626b4c da94781
Author: Benjamin Lerer <b....@gmail.com>
Authored: Mon Dec 12 13:51:25 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Mon Dec 12 13:51:25 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../operations/InsertUpdateIfConditionTest.java | 125 +++++++++++--------
2 files changed, 76 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c80b9fb3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7b017bb,bbd47c1..d056492
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -164,10 -53,6 +164,11 @@@ Merged from 3.0
* Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
* Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
Merged from 2.2:
++ * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
+ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
* Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
* Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
* cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c80b9fb3/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
----------------------------------------------------------------------