cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 11 Mar 2016 22:50:41 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 854a243af91d1e5ca16ac7c03e5a437187323095
Parents: 2d48ddf 971d649
Author: Yuki Morishita <yukim@apache.org>
Authored: Fri Mar 11 16:27:42 2016 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Mar 11 16:27:42 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt  | 1 +
 bin/cqlsh.py | 5 +++++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/854a243a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 541f11c,b37ef84..3b5e51f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,12 @@@
 -2.2.6
 +3.0.5
 + * 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)
 + * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
 + * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 +Merged from 2.2:
+  * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
 - * Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196)
 - * Non-obsoleting compaction operations over compressed files can impose rate limit on normal
reads (CASSANDRA-11301)
   * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
   * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
   * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/854a243a/bin/cqlsh.py
----------------------------------------------------------------------


Mime
View raw message