cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Date Thu, 10 Mar 2016 20:40:23 GMT
Merge branch 'cassandra-3.0' into cassandra-3.5


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

Branch: refs/heads/cassandra-3.5
Commit: 46860aa6280534e5da0718a424ee97d70087e3b2
Parents: 10d61d4 48bdb41
Author: Yuki Morishita <yukim@apache.org>
Authored: Thu Mar 10 14:39:58 2016 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Thu Mar 10 14:39:58 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt                                            |  1 +
 src/java/org/apache/cassandra/tools/SSTableExport.java | 11 +++++++++++
 2 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/46860aa6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 292ebb5,541f11c..e727ad5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.5
 +3.5
 +Merged from 3.0:
+  * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
   * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
   * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
   * Remove recursive call from CompositesSearcher (CASSANDRA-11304)


Mime
View raw message