This is an automated email from the ASF dual-hosted git repository.
bdeggleston pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e9e883baaed1cfda3c1bebf8f1825efc1e0f2df0
Merge: 4a70a9a 7d2c3c2
Author: Blake Eggleston <bdeggles...@gmail.com>
AuthorDate: Wed Apr 24 11:19:48 2019 -0700
Merge branch 'cassandra-2.2' into cassandra-3.0
CHANGES.txt | 1 +
.../cassandra/distributed/api/IInstance.java | 3 +++
.../distributed/impl/AbstractCluster.java | 18 ++++++++++++++++-
.../impl/DelegatingInvokableInstance.java | 12 +++++++++++
.../cassandra/distributed/impl/Instance.java | 23 ++++++++++++++++------
.../distributed/impl/InstanceClassLoader.java | 11 +++++++++++
.../distributed/upgrade/UpgradeTestBase.java | 11 ++++-------
7 files changed, 65 insertions(+), 14 deletions(-)
diff --cc CHANGES.txt
index 8ee7e06,1cc4153..b38ab06
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
-2.2.15
+3.0.19
+ * cassandra-stress works with frozen collections: list and set
(CASSANDRA-14907)
+ * For nodetool listsnapshots output, put spaces between columns, and
increase snapshot padding (CASSANDRA-14876)
+ * Fix handling FS errors on writing and reading flat files - LogTransaction
and hints (CASSANDRA-15053)
+ * Avoid double closing the iterator to avoid overcounting the number of
requests (CASSANDRA-15058)
+ * Improve `nodetool status -r` speed (CASSANDRA-14847)
+ * Improve merkle tree size and time on heap (CASSANDRA-14096)
+ * Add missing commands to nodetool-completion (CASSANDRA-14916)
+ * Anti-compaction temporarily corrupts sstable state for readers
(CASSANDRA-15004)
+ Merged from 2.2:
+ * Support cross version messaging in in-jvm upgrade dtests (CASSANDRA-15078)
* Fix index summary redistribution cancellation (CASSANDRA-15045)
* Refactor Circle CI configuration (CASSANDRA-14806)
* Fixing invalid CQL in security documentation (CASSANDRA-15020)
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index e0e1dc9,dce03ca..dddabf8
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -64,14 -64,9 +64,12 @@@ import org.apache.cassandra.distributed
import org.apache.cassandra.gms.ApplicationState;
import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.gms.VersionedValue;
+import org.apache.cassandra.hints.HintsService;
+import org.apache.cassandra.index.SecondaryIndexManager;
import org.apache.cassandra.io.sstable.format.SSTableReader;
+import org.apache.cassandra.io.util.DataInputBuffer;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.locator.InetAddressAndPort;
- import org.apache.cassandra.metrics.CassandraMetricsRegistry;
import org.apache.cassandra.net.IMessageSink;
import org.apache.cassandra.net.MessageDeliveryTask;
import org.apache.cassandra.net.MessageIn;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
