merge from 1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dfc7b275 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfc7b275 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfc7b275 Branch: refs/heads/cassandra-1.2 Commit: dfc7b2753ba76b1ca2efce3eb20e3a72f55ce2d0 Parents: 07c6ff1 8a96ec7 Author: Jonathan Ellis <[email protected]> Authored: Tue Dec 4 21:46:02 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Tue Dec 4 21:46:02 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 4 +++ conf/cassandra.yaml | 15 +++++------ src/java/org/apache/cassandra/config/Config.java | 10 +++--- .../cassandra/config/DatabaseDescriptor.java | 20 +++++++------- .../org/apache/cassandra/net/MessagingService.java | 2 +- 5 files changed, 27 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfc7b275/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ccbdcb4,a08e78a..8d40f09 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,7 +1,15 @@@ +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) + + 1.2-beta3 * make consistency level configurable in cqlsh (CASSANDRA-4829) * fix cqlsh rendering of blob fields (CASSANDRA-4970)
