You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2021/04/22 13:33:27 UTC

[cassandra] branch trunk updated (2bd07ec -> 31042453)

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

brandonwilliams pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 2bd07ec  Minor nodetool verify fixes
     new 34267c2  Update links in CONTRIBUTING.md
     new d1eb6d0  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 31042453 Merge branch 'cassandra-3.11' into trunk

The 3 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:
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 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-3.11' into trunk

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

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 31042453a74e2954882a7741d9d7293302c93e7d
Merge: 2bd07ec d1eb6d0
Author: Brandon Williams <br...@apache.org>
AuthorDate: Thu Apr 22 08:32:58 2021 -0500

    Merge branch 'cassandra-3.11' into trunk

 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --cc CONTRIBUTING.md
index ac12fb3,ccd7c7c..9b33116
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@@ -30,9 -30,8 +30,9 @@@ Use [Cassandra JIRA](https://issues.apa
  # Useful Links
  
  - How you can contribute to Apache Cassandra [presentation](http://www.slideshare.net/yukim/cassandrasummit2013) by Yuki Morishita
- - Code style [wiki page](https://wiki.apache.org/cassandra/CodeStyle)
- - Running Cassandra in IDEA [guide](https://wiki.apache.org/cassandra/RunningCassandraInIDEA)
- - Running Cassandra in Eclipse [guide](https://wiki.apache.org/cassandra/RunningCassandraInEclipse)
+ - Code style [wiki page](https://cwiki.apache.org/confluence/display/CASSANDRA2/CodeStyle)
+ - Running Cassandra in IDEA [guide](https://cwiki.apache.org/confluence/display/CASSANDRA2/RunningCassandraInIDEA)
+ - Running Cassandra in Eclipse [guide](https://cwiki.apache.org/confluence/display/CASSANDRA2/RunningCassandraInEclipse)
  - Cassandra Cluster Manager - [CCM](https://github.com/pcmanus/ccm) and a guide [blog post](http://www.datastax.com/dev/blog/ccm-a-development-tool-for-creating-local-cassandra-clusters)
 -- Cassandra Distributed Tests aka [dtests](https://github.com/riptano/cassandra-dtest)
 +- Cassandra Distributed Tests aka [dtests](https://github.com/apache/cassandra-dtest)
 +- Cassandra Testing Guidelines - see TESTING.md

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