cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/6] git commit: Merge branch 'cassandra-1.1' into trunk
Date Wed, 22 Feb 2012 08:43:31 GMT
Updated Branches:
  refs/heads/trunk 590661faf -> a9e091910


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

Branch: refs/heads/trunk
Commit: a9e091910d0dff59d6d2669d0fcebec13f119f63
Parents: 590661f 9f90a79
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Feb 22 09:43:20 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Feb 22 09:43:20 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    5 +
 src/java/org/apache/cassandra/cli/CliOptions.java  |    4 -
 .../org/apache/cassandra/cli/CliSessionState.java  |    2 +-
 .../apache/cassandra/db/CollationController.java   |    6 +-
 src/java/org/apache/cassandra/db/Memtable.java     |    3 +-
 .../cassandra/db/ThreadSafeSortedColumns.java      |  184 +++++++++++++++
 .../service/AbstractWriteResponseHandler.java      |   27 --
 .../cassandra/service/IWriteResponseHandler.java   |    1 -
 .../org/apache/cassandra/service/StorageProxy.java |    5 +-
 9 files changed, 198 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9e09191/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d7e5e3f,ade1ba8..6bd621e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -5,8 -5,11 +5,12 @@@
   * Show Effective Owership via Nodetool ring <keyspace> (CASSANDRA-3412)
   * Update ORDER BY syntax for CQL3 (CASSANDRA-3925)
   * Fix BulkRecordWriter to not throw NPE if reducer gets no map data from Hadoop (CASSANDRA-3944)
+  * Fix bug with counters in super columns (CASSANDRA-3821)
+ Merged from 1.0:
+  * remove the wait on hint future during write (CASSANDRA-3870)
+ 
  
 +
  1.1-beta1
   * add nodetool rebuild_index (CASSANDRA-3583)
   * add nodetool rangekeysample (CASSANDRA-2917)


Mime
View raw message