cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [9/50] git commit: Merge branch 'cassandra-1.1' into trunk
Date Fri, 24 Feb 2012 15:49:22 GMT
Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/cassandra-1.1
Commit: d359d8f6176c7ea823a61a9695b52ecd89ec1cb3
Parents: a976937 5191780
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Feb 22 14:23:48 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Feb 22 14:23:48 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 .../cassandra/db/RetriedSliceFromReadCommand.java  |    2 +-
 .../apache/cassandra/db/SliceFromReadCommand.java  |   25 ++++++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d359d8f6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 086eb0b,ae921d1..3f5a3f4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -10,9 -10,9 +10,10 @@@ Merged from 1.0
   * remove the wait on hint future during write (CASSANDRA-3870)
   * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)
   * (cqlsh) look for cqlshlib relative to realpath (CASSANDRA-3767)
+  * Fix short read protection (CASSANDRA-3934)
  
  
 +
  1.1-beta1
   * add nodetool rebuild_index (CASSANDRA-3583)
   * add nodetool rangekeysample (CASSANDRA-2917)


Mime
View raw message