cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/5] git commit: Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Date Tue, 13 Nov 2012 07:58:27 GMT
Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/CFMetaData.java


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

Branch: refs/heads/trunk
Commit: 76613ee4c99952099c365f084543ca3b84aeaee7
Parents: 5394318 f56ea8b
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Nov 13 08:57:21 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Nov 13 08:57:21 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    6 +
 bin/cqlsh                                          |   25 ++--
 .../org/apache/cassandra/config/CFMetaData.java    |    2 +-
 .../apache/cassandra/cql3/UntypedResultSet.java    |    9 ++-
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   97 ++++-----------
 src/java/org/apache/cassandra/db/SystemTable.java  |   64 ++++++++++
 .../cassandra/db/commitlog/CommitLogReplayer.java  |   21 ++--
 .../cassandra/db/compaction/CompactionManager.java |   13 ++-
 .../org/apache/cassandra/service/StorageProxy.java |   23 ++++-
 9 files changed, 163 insertions(+), 97 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/76613ee4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 77cc8a8,7d4882d..518d3ec
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -8,7 -10,10 +10,11 @@@
   * Separate tracing from Log4J (CASSANDRA-4861)
   * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
   * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTomstone check in CC.collectAllData (CASSANDRA-4883)
+ Merged from 1.1:
+  * reset getRangeSlice filter after finishing a row for get_paged_slice
+    (CASSANDRA-4919)
+  * expunge row cache post-truncate (CASSANDRA-4940)
  
  
  1.2-beta2


Mime
View raw message