cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [5/6] git commit: merge from 2.1.0
Date Tue, 08 Jul 2014 20:57:49 GMT
merge from 2.1.0


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

Branch: refs/heads/cassandra-2.1
Commit: f72d0247a79bc7bca078b32d4dd3c1a5fefe4447
Parents: 04944f0 c29e48d
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Jul 8 15:59:15 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Jul 8 15:59:15 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt            | 4 ++++
 conf/cassandra-env.ps1 | 8 ++++++++
 2 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f72d0247/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6421b6f,180b044..9e84d31
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,7 +1,14 @@@
 +2.1.1
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 +
 +
+ 2.1.0-final
+  * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+ 
+ 
  2.1.0-rc3
   * Consider expiry when reconciling otherwise equal cells (CASSANDRA-7403)
   * Introduce CQL support for stress tool (CASSANDRA-6146)


Mime
View raw message