[cassandra] branch cassandra-3.11 updated (6411b44 -> 610d5d4)

[if...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ifesdjeen pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 6411b44  Merge branch cassandra-3.0 into cassandra-3.11
     add 11af037  Add blocking pendingranges calculation when keyspace is added
     add 610d5d4  Merge branch 'cassandra-3.0' into cassandra-3.11

No new revisions were added by this update.

Summary of changes:
 .../org/apache/cassandra/gms/VersionedValue.java   |   6 +
 .../apache/cassandra/schema/SchemaKeyspace.java    |  10 ++
 .../cassandra/distributed/action/GossipHelper.java | 142 +++++++++++++++++++++
 .../distributed/action/InstanceAction.java         |  13 +-
 ...ception.java => VersionedApplicationState.java} |  15 ++-
 .../cassandra/distributed/test/BootstrapTest.java  |  38 +++++-
 6 files changed, 206 insertions(+), 18 deletions(-)
 create mode 100644 test/distributed/org/apache/cassandra/distributed/action/GossipHelper.java
 copy src/java/org/apache/cassandra/io/util/BytesReadTracker.java => test/distributed/org/apache/cassandra/distributed/action/InstanceAction.java (78%)
 copy test/distributed/org/apache/cassandra/distributed/shared/{ShutdownException.java => VersionedApplicationState.java} (69%)

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