Merge branch 'cassandra-2.1' into cassandra-2.2
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/c34a3292
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c34a3292
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c34a3292
Branch: refs/heads/cassandra-2.2
Commit: c34a329216ee2c73aed623a50501edc15bdea92c
Parents: 06e742f f294ee1
Author: Tyler Hobbs <[email protected]>
Authored: Fri May 29 14:16:43 2015 -0500
Committer: Tyler Hobbs <[email protected]>
Committed: Fri May 29 14:16:43 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/cql3/statements/CreateTableStatement.java | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c34a3292/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index dc13bea,0eb0751..c73a188
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,19 @@@
-2.1.6
+2.2
+ * ant test-all results incomplete when parsed (CASSANDRA-9463)
+ * Disallow frozen<> types in function arguments and return types for
+ clarity (CASSANDRA-9411)
+ * Static Analysis to warn on unsafe use of Autocloseable instances
(CASSANDRA-9431)
+ * Update commitlog archiving examples now that commitlog segments are
+ not recycled (CASSANDRA-9350)
+ * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568)
+ * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399)
+ * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
+ * Revert CASSANDRA-7807 (tracing completion client notifications)
(CASSANDRA-9429)
+ * Add ability to stop compaction by ID (CASSANDRA-7207)
+ * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438)
+Merged from 2.1:
+ * Consistent error message when a table mixes counter and non-counter
+ columns (CASSANDRA-9492)
* Avoid getting unreadable keys during anticompaction (CASSANDRA-9508)
* (cqlsh) Better float precision by default (CASSANDRA-9224)
* Improve estimated row count (CASSANDRA-9107)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c34a3292/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
----------------------------------------------------------------------
