cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 18 Sep 2015 16:20:07 GMT
Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95ba0e21
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95ba0e21
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95ba0e21

Branch: refs/heads/trunk
Commit: 95ba0e21d9959d16b1d5fcd8d6b60c4361e77657
Parents: e20c90f 6e805ca
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Fri Sep 18 17:18:12 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Fri Sep 18 17:18:12 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 .../cassandra/cql3/statements/ModificationStatement.java       | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/95ba0e21/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a997a36,775d8a4..0ffd919
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-rc1
+  * Check partition keys for CAS operations during stmt validation (CASSANDRA-10338)
   * Add custom query expressions to SELECT (CASSANDRA-10217)
   * Fix minor bugs in MV handling (CASSANDRA-10362)
   * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)


Mime
View raw message