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, 04 Nov 2015 10:41:05 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/5a1d6553
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a1d6553
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a1d6553

Branch: refs/heads/trunk
Commit: 5a1d6553e64592f046fb1d01756c75fea8c1d777
Parents: 724ba07 2c99761
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Nov 4 11:40:56 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Nov 4 11:40:56 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/db/LegacyLayout.java   |  7 +-
 .../apache/cassandra/db/LegacyCellNameTest.java | 81 ++++++++++++++++++++
 3 files changed, 87 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a1d6553/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b0aad8c,e9f92c6..1d6a84c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix bug when adding a column to thrift with the same name than a primary key (CASSANDRA-10608)
   * Add client address argument to IAuthenticator::newSaslNegotiator (CASSANDRA-8068)
   * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
   * Don't use 'names query' read path for counters (CASSANDRA-10572)


Mime
View raw message