Merge branch 'cassandra-2.1' into trunk
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/51db18cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51db18cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51db18cf
Branch: refs/heads/trunk
Commit: 51db18cf03d9c56ee311154038abaab753ddb770
Parents: eb56b49 2fe6de6
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Fri Jun 20 18:34:46 2014 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Fri Jun 20 18:34:46 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 3 +-
doc/native_protocol_v3.spec | 29 ++++++----------
src/java/org/apache/cassandra/cql3/UTName.java | 5 +++
.../cql3/statements/AlterKeyspaceStatement.java | 6 ++--
.../cql3/statements/AlterTableStatement.java | 6 ++--
.../cql3/statements/AlterTypeStatement.java | 6 ++--
.../cql3/statements/CreateIndexStatement.java | 6 ++--
.../statements/CreateKeyspaceStatement.java | 6 ++--
.../cql3/statements/CreateTableStatement.java | 6 ++--
.../cql3/statements/CreateTriggerStatement.java | 6 ++--
.../cql3/statements/CreateTypeStatement.java | 6 ++--
.../cql3/statements/DropIndexStatement.java | 6 ++--
.../cql3/statements/DropKeyspaceStatement.java | 6 ++--
.../cql3/statements/DropTableStatement.java | 6 ++--
.../cql3/statements/DropTriggerStatement.java | 6 ++--
.../cql3/statements/DropTypeStatement.java | 6 ++--
.../statements/SchemaAlteringStatement.java | 9 +++--
.../org/apache/cassandra/transport/Event.java | 6 ++--
.../transport/messages/ResultMessage.java | 35 ++++----------------
19 files changed, 70 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51db18cf/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ad325a5,7288de6..2912060
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,4 +1,17 @@@
+3.0
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7208)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+
+
+
- 2.1.0
+ 2.1.0-rc2
* Modify reconcile logic to always pick a tombstone over a counter cell
(CASSANDRA-7346)
* Avoid incremental compaction on Windows (CASSANDRA-7365)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51db18cf/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51db18cf/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
----------------------------------------------------------------------
