You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2020/04/09 14:33:05 UTC

[cassandra] branch cassandra-3.0 updated (fe263ad -> 7d201cd)

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

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


    from fe263ad  Merge branch 'cassandra-2.2' into cassandra-3.0
     new 479a76d  Fix upgrade dtests
     new 7d201cd  Merge branch 'cassandra-2.2' into cassandra-3.0

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../cassandra/distributed/UpgradeableCluster.java       |  9 ---------
 .../cassandra/distributed/impl/InstanceConfig.java      |  2 +-
 .../cassandra/distributed/upgrade/UpgradeTestBase.java  | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 10 deletions(-)


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


[cassandra] 01/01: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 7d201cd0e32260d80ada3a0de0829d129632b1c9
Merge: fe263ad 479a76d
Author: Marcus Eriksson <ma...@apache.org>
AuthorDate: Thu Apr 9 16:30:27 2020 +0200

    Merge branch 'cassandra-2.2' into cassandra-3.0

 .../cassandra/distributed/UpgradeableCluster.java       |  9 ---------
 .../cassandra/distributed/impl/InstanceConfig.java      |  2 +-
 .../cassandra/distributed/upgrade/UpgradeTestBase.java  | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 10 deletions(-)



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