cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Wed, 14 Oct 2015 09:56:22 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/d16892a7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d16892a7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d16892a7

Branch: refs/heads/trunk
Commit: d16892a7dfe863a15500fc29db8333da1a8f6a34
Parents: 1ad9914 26c8892
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Oct 14 11:56:13 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Oct 14 11:56:13 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                         | 1 +
 src/java/org/apache/cassandra/db/rows/BTreeRow.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d16892a7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 59cd12a,84b85cf..e8ffa0f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0-rc2
+  * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
   * Fix NPE in MVs on update (CASSANDRA-10503)
   * Only include modified cell data in indexing deltas (CASSANDRA-10438)
   * Do not load keyspace when creating sstable writer (CASSANDRA-10443)


Mime
View raw message