You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2021/09/10 22:40:52 UTC

[cassandra] branch cassandra-3.11 updated (5cdddcf -> 32194ec)

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

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


    from 5cdddcf  Make assassinate more resilient to missing tokens
     new b6f0864  Add semver4j to the default shared packages in the jvm dtests
     new 32194ec  Merge branch 'cassandra-3.0' into cassandra-3.11

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:
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

---------------------------------------------------------------------
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-3.0' into cassandra-3.11

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

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

commit 32194ec8d060920570f48fa9982e13b67f140e85
Merge: 5cdddcf b6f0864
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Sat Sep 11 00:05:06 2021 +0200

    Merge branch 'cassandra-3.0' into cassandra-3.11

 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc build.xml
index 34bca92,3e77a95..db2d64c
--- a/build.xml
+++ b/build.xml
@@@ -364,11 -339,14 +364,11 @@@
  	         <exclusion groupId="org.apache.httpcomponents" artifactId="httpclient"/>
  	         <exclusion groupId="org.apache.httpcomponents" artifactId="httpcore"/>
            </dependency>
 -          <dependency groupId="junit" artifactId="junit" version="4.6" scope="test">
 +          <dependency groupId="junit" artifactId="junit" version="4.12" scope="test">
              <exclusion groupId="org.hamcrest" artifactId="hamcrest-core"/>
            </dependency>
 -          <dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.10">
 -             <exclusion groupId="commons-lang" artifactId="commons-lang"/>
 -          </dependency>
            <dependency groupId="org.mockito" artifactId="mockito-core" version="3.2.4" scope="test"/>
-           <dependency groupId="org.apache.cassandra" artifactId="dtest-api" version="0.0.8" scope="test"/>
+           <dependency groupId="org.apache.cassandra" artifactId="dtest-api" version="0.0.9" scope="test"/>
            <dependency groupId="org.reflections" artifactId="reflections" version="0.9.12" scope="test"/>
            <dependency groupId="org.quicktheories" artifactId="quicktheories" version="0.25" scope="test"/>
            <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3" scope="provided">

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