cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Sat, 22 Feb 2014 14:24:30 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 4620823232181806046c89de8a540090c996ce8e
Parents: c5dd986 0510d4e
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Sat Feb 22 08:24:25 2014 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Sat Feb 22 08:24:25 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                 | 1 +
 .../org/apache/cassandra/config/DatabaseDescriptor.java     | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/46208232/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5a8d068,b1fedd2..2a1cf17
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.0
 + * Remove CQL2 (CASSANDRA-5918)
 +
 +
  2.1.0-beta2
+  * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
   * Fix ABTC NPE (CASSANDRA-6692)
   * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
   * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)


Mime
View raw message