You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/05/06 18:24:34 UTC
[13/13] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac0036b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac0036b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac0036b7
Branch: refs/heads/trunk
Commit: ac0036b72a69c8bc7851df99a8dda984e0e6f276
Parents: adbef79 02f8725
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri May 6 14:22:44 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri May 6 14:22:44 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/cql3/statements/CreateTableStatement.java | 4 ++--
.../cql3/validation/entities/CountersTest.java | 12 +++++++++++-
3 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac0036b7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8e545c4,3cee7ae..d9f1688
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,9 -3,9 +9,10 @@@ Merged from 3.0
* Refactor Materialized View code (CASSANDRA-11475)
* Update Java Driver (CASSANDRA-11615)
Merged from 2.2:
+ * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
* cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
+
3.6
* Enhanced Compaction Logging (CASSANDRA-10805)
* Make prepared statement cache size configurable (CASSANDRA-11555)