cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aweisb...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Date Thu, 29 Jun 2017 20:13:47 GMT
Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: fe3cfe3d7df296f022c50c9c0d22f91a0fc0a217
Parents: 20d5ce8 7afb97c
Author: Ariel Weisberg <aweisberg@apple.com>
Authored: Thu Jun 29 16:12:35 2017 -0400
Committer: Ariel Weisberg <aweisberg@apple.com>
Committed: Thu Jun 29 16:12:35 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe3cfe3d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 211769c,096dfa4..e56eb78
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -85,8 -1,9 +85,9 @@@
  3.11.1
   * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
  Merged from 3.0:
 - * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 - * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
 - * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568)
++  * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 +  * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) 
 +  * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568)
  
  
  3.11.0


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message