cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [2/10] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Date Thu, 13 Dec 2012 16:53:15 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/aa8828a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa8828a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa8828a2

Branch: refs/heads/cassandra-1.2
Commit: aa8828a27bb1eb34c7ab2d2c4b534cb14515751d
Parents: 1583769 3474613
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Dec 13 10:53:01 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Dec 13 10:53:01 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |    4 +++-
 src/java/org/apache/cassandra/db/DefsTable.java |   13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa8828a2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8a93921,e09e925..804af51
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,7 +1,19 @@@
 +1.2.1
 + * 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)
 +
 +
  1.2.0
   * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
+ Merged from 1.1:
+  * fix temporarily missing schema after upgrade from pre-1.1.5 (CASSANDRA-5061)
  
  
  1.2-rc1


Mime
View raw message