cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Date Wed, 25 Nov 2015 14:05:06 GMT
Merge branch 'cassandra-3.0' into cassandra-3.1

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/trunk
Commit: af089f6fff9bc9587f6467a50ae6ad1634040193
Parents: 8e1b6ea a0076e7
Author: T Jake Luciani <jake@apache.org>
Authored: Wed Nov 25 09:04:29 2015 -0500
Committer: T Jake Luciani <jake@apache.org>
Committed: Wed Nov 25 09:04:29 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/stress/settings/SettingsMode.java | 22 +++++++++++++----
 .../cassandra/stress/util/JavaDriverClient.java | 26 +++++++++++++++++---
 3 files changed, 40 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/af089f6f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 75922bf,513e682..9f6a027
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Improve stress performance over 1k threads (CASSANDRA-7217)
   * Wait for migration responses to complete before bootstrapping (CASSANDRA-10731)
   * Unable to create a function with argument of type Inet (CASSANDRA-10741)
   * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)


Mime
View raw message