cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Date Wed, 05 Dec 2012 05:18:26 GMT
Merge branch 'cassandra-1.2.0' into cassandra-1.2


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

Branch: refs/heads/trunk
Commit: dc682de2e9470a3f77c47d29d50e02b99bdd9c58
Parents: 0f75215 2158131
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Dec 4 23:18:09 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Dec 4 23:18:09 2012 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc682de2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8d40f09,732cc5d..f77425f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,6 +1,14 @@@
 +1.2.1
 + * pool [Compressed]RandomAccessReader objects on the partitioned read path
 +   (CASSANDRA-4942)
 + * Add debug logging to list filenames processed by Directories.migrateFile 
 +   method (CASSANDRA-4939)
 + * Expose black-listed directories via JMX (CASSANDRA-4848)
 +
 +
  1.2-rc1
   * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
+  * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
  
  
  1.2-beta3


Mime
View raw message