cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/2] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Date Thu, 20 Dec 2012 15:13:07 GMT
Updated Branches:
  refs/heads/cassandra-1.2 ead0662c2 -> f4700edb4


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/f4700edb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4700edb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4700edb

Branch: refs/heads/cassandra-1.2
Commit: f4700edb4821fbfe33d0b9e6041f1a5fa3f5880c
Parents: ead0662 986893e
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Dec 20 16:12:56 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Dec 20 16:12:56 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    4 +++
 src/java/org/apache/cassandra/cql3/ParsedType.java |   22 +++++++++++++++
 2 files changed, 26 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4700edb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4f095f1,45b0b5b..401a9af
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,22 @@@
 +1.2.1
 + * fix hinting for dropped local writes (CASSANDRA-4753)
 + * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
 + * apply disk_failure_policy to bad disks on initial directory creation 
 +   (CASSANDRA-4847)
 + * Optimize name-based queries to use ArrayBackedSortedColumns (CASSANDRA-5043)
 + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
 + * 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)
 + * Log compaction merge counts (CASSANDRA-4894)
 +
 +
+ 1.2.0
+  * Disallow counters in collections (CASSANDRA-5082)
+ 
++
  1.2.0-rc2
   * fix nodetool ownership display with vnodes (CASSANDRA-5065)
   * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)


Mime
View raw message