Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad5169d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad5169d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad5169d2
Branch: refs/heads/trunk
Commit: ad5169d2f8c700799000eb3fafb3cdc606fbafde
Parents: 6e03782 ed93ad4
Author: Aleksey Yeschenko <[email protected]>
Authored: Wed Mar 12 15:07:16 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Wed Mar 12 15:07:16 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad5169d2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0442b4e,906f91f..d8eb3a1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,6 -2,10 +15,7 @@@ Merged from 2.0
* Fix saving triggers to schema (CASSANDRA-6789)
* Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
* Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
+ * Fix static counter columns (CASSANDRA-6827)
-
-
-2.0.6
* Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797)
* Pool CqlRecordWriter clients by inetaddress rather than Range
(CASSANDRA-6665)
