Merge branch cassandra-2.1 into cassandra-2.2
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3379073
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3379073
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3379073
Branch: refs/heads/cassandra-2.2
Commit: a33790730a9ef0fd2ef3a6c18f00dfee013a68e3
Parents: 728f94e 9b3b1cb
Author: blerer <benjamin.le...@datastax.com>
Authored: Tue Oct 20 14:06:45 2015 +0200
Committer: blerer <benjamin.le...@datastax.com>
Committed: Tue Oct 20 14:06:45 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 2 +-
.../cql3/statements/ModificationStatement.java | 23 +++++++++++++++++++-
.../operations/InsertUpdateIfConditionTest.java | 12 +++++++++-
4 files changed, 35 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3379073/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3eff22c,b17929c..261a53a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,12 @@@
-2.1.12
+2.2.4
+ * Expose phi values from failure detector via JMX and tweak debug
+ and trace logging (CASSANDRA-9526)
+ * Fix RangeNamesQueryPager (CASSANDRA-10509)
+ * Deprecate Pig support (CASSANDRA-10542)
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+Merged from 2.1:
+ * Fix conditions on static columns (CASSANDRA-10264)
* AssertionError: attempted to delete non-existing file CommitLog
(CASSANDRA-10377)
- * Merge range tombstones during compaction (CASSANDRA-7953)
* (cqlsh) Distinguish negative and positive infinity in output
(CASSANDRA-10523)
* (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
* Don't allow startup if the node's rack has changed (CASSANDRA-10242)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3379073/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3379073/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3379073/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
----------------------------------------------------------------------
