cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Date Wed, 09 Mar 2016 17:50:34 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/d2333a92
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2333a92
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2333a92

Branch: refs/heads/cassandra-3.5
Commit: d2333a9256c67306c617a237a5f465f913263702
Parents: e33d4be b808a18
Author: Yuki Morishita <yukim@apache.org>
Authored: Wed Mar 9 11:43:37 2016 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Wed Mar 9 11:43:37 2016 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2333a92/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 72ce859,5efb1b0..ff67a2b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -3,6 -3,8 +3,7 @@@ Merged from 3.0
   * 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:
+  * 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)
   * Only log yaml config once, at startup (CASSANDRA-11217)
   * Reference leak with parallel repairs on the same table (CASSANDRA-11215)


Mime
View raw message