cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [11/21] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Date Mon, 03 Dec 2012 20:32:57 GMT
Merge branch 'cassandra-1.2.0' into cassandra-1.2

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 35b7271253bd7a4483f862cab976fbcc00d914e4
Parents: 2721958 d42e3b6
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Mon Dec 3 14:27:28 2012 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Mon Dec 3 14:27:28 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +-
 build.xml                                          |    2 +-
 debian/changelog                                   |    6 +-
 .../org/apache/cassandra/dht/RangeStreamer.java    |   77 +++------------
 4 files changed, 19 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/35b72712/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 366e4b6,917b958..a14abad
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,4 +1,12 @@@
 +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
+ 1.2-beta3
   * make consistency level configurable in cqlsh (CASSANDRA-4829)
   * fix cqlsh rendering of blob fields (CASSANDRA-4970)
   * fix cqlsh DESCRIBE command (CASSANDRA-4913)


Mime
View raw message