You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/09/01 07:52:48 UTC
[2/2] cassandra git commit: Merge branch 'trunk' of
http://git-wip-us.apache.org/repos/asf/cassandra into trunk
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk
* 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra:
cqlshlib tests: increase default execute timeout
Fix legacy regex for temporary files from 2.2
add Serializable to Stress settings for daemon mode
Cleanup MessagingService socket after catching Throwable (ninja #11841)
Add keep-alive to streaming
Forward writes to replacement node when replace_address != broadcast_address
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f3ad288
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f3ad288
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f3ad288
Branch: refs/heads/trunk
Commit: 5f3ad28802ba77f8d428a65c97f47ab06f077427
Parents: 58abe8a 45f96c8
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Sep 1 09:51:24 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Sep 1 09:51:24 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 4 +
NEWS.txt | 3 +
conf/cassandra.yaml | 14 +-
pylib/cqlshlib/test/cassconnect.py | 2 +
.../org/apache/cassandra/config/Config.java | 6 +
.../cassandra/config/DatabaseDescriptor.java | 10 +
src/java/org/apache/cassandra/gms/Gossiper.java | 18 +-
.../apache/cassandra/gms/VersionedValue.java | 6 +
.../apache/cassandra/io/sstable/Descriptor.java | 2 +-
.../apache/cassandra/locator/TokenMetadata.java | 52 +++++-
.../net/IncomingStreamingConnection.java | 5 +-
.../apache/cassandra/net/MessagingService.java | 4 +-
.../cassandra/service/LoadBroadcaster.java | 2 +-
.../cassandra/service/StorageService.java | 182 ++++++++++++++-----
.../cassandra/streaming/ConnectionHandler.java | 59 ++++--
.../cassandra/streaming/StreamReader.java | 2 +-
.../cassandra/streaming/StreamSession.java | 103 ++++++++++-
.../streaming/messages/KeepAliveMessage.java | 49 +++++
.../streaming/messages/StreamMessage.java | 15 +-
.../cassandra/utils/CassandraVersion.java | 2 +-
.../tmp-lb-3-big-Data.db | Bin 0 -> 93 bytes
.../tmp-lb-3-big-Index.db | Bin 0 -> 54 bytes
.../apache/cassandra/db/SystemKeyspaceTest.java | 8 +-
.../cassandra/utils/CassandraVersionTest.java | 17 ++
.../stress/settings/GroupedOptions.java | 9 +-
.../cassandra/stress/settings/Option.java | 3 +-
.../stress/settings/SettingsTokenRange.java | 5 +-
.../stress/settings/StressSettingsTest.java | 39 ++++
28 files changed, 517 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f3ad288/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 842f207,1d26edf..228cb92
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
3.10
+ * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567)
+ * Add keep-alive to streaming (CASSANDRA-11841)
* Tracing payload is passed through newSession(..) (CASSANDRA-11706)
* avoid deleting non existing sstable files and improve related log messages (CASSANDRA-12261)
* json/yaml output format for nodetool compactionhistory (CASSANDRA-12486)