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 2023/08/31 20:47:25 UTC

[cassandra] branch trunk updated (1f1ec5f503 -> 1c3c5008f9)

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

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


    from 1f1ec5f503 Merge branch 'cassandra-5.0' into trunk
     new ce49e775f7 Missing license info and headers
     new 14e89fc3c7 Merge branch 'cassandra-3.0' into cassandra-3.11
     new aa2494b30b Merge branch 'cassandra-3.11' into cassandra-4.0
     new 20125c5053 Merge branch 'cassandra-4.0' into cassandra-4.1
     new 865954fd99 Merge branch 'cassandra-4.1' into cassandra-5.0
     new 1c3c5008f9 Merge branch 'cassandra-5.0' into trunk

The 6 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/build-rat.xml                               | 97 ++++++++++++----------
 .jenkins/Jenkinsfile                               | 13 ++-
 LICENSE.txt                                        | 18 +++-
 build.properties.default                           | 19 +++++
 conf/cassandra-jaas.config                         | 16 ++++
 conf/jvm-clients.options                           | 18 ++++
 conf/jvm-server.options                            | 18 ++++
 conf/jvm11-clients.options                         | 18 ++++
 conf/jvm11-server.options                          | 18 ++++
 debian/cassandra.conf                              | 17 ++++
 debian/cassandra.postinst                          | 19 +++++
 debian/default                                     | 18 ++++
 debian/init                                        | 18 ++++
 debian/nodetool-completion                         | 17 ++++
 debian/rules                                       | 19 ++++-
 pylib/Dockerfile.ubuntu.py3                        | 16 ++++
 pylib/Dockerfile.ubuntu.py37                       | 11 +++
 pylib/Dockerfile.ubuntu.py38                       | 11 +++
 pylib/requirements.txt                             | 19 +++++
 redhat/cassandra                                   | 17 ++++
 redhat/cassandra.conf                              | 17 ++++
 redhat/default                                     | 17 ++++
 ...ssandra.io.sstable.format.SSTableFormat$Factory | 17 ++++
 .../cassandra/cql3/functions/JavaSourceUDF.txt     | 17 ++++
 test/conf/harry-generic.yaml                       | 17 ++++
 test/data/config/version=3.0.0-alpha1.yml          | 17 ++++
 test/data/config/version=3.11.0.yml                | 17 ++++
 test/data/config/version=4.0-alpha1.yml            | 17 ++++
 test/data/config/version=4.1-alpha1.yml            | 17 ++++
 test/data/config/version=5.0-alpha1.yml            | 17 ++++
 30 files changed, 531 insertions(+), 56 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-5.0' into trunk

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

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

commit 1c3c5008f9dee366419ed9726385a929a08c7104
Merge: 1f1ec5f503 865954fd99
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Thu Aug 31 22:44:15 2023 +0200

    Merge branch 'cassandra-5.0' into trunk
    
    * cassandra-5.0:
      Missing license info and headers

 .build/build-rat.xml                               | 97 ++++++++++++----------
 .jenkins/Jenkinsfile                               | 13 ++-
 LICENSE.txt                                        | 18 +++-
 build.properties.default                           | 19 +++++
 conf/cassandra-jaas.config                         | 16 ++++
 conf/jvm-clients.options                           | 18 ++++
 conf/jvm-server.options                            | 18 ++++
 conf/jvm11-clients.options                         | 18 ++++
 conf/jvm11-server.options                          | 18 ++++
 debian/cassandra.conf                              | 17 ++++
 debian/cassandra.postinst                          | 19 +++++
 debian/default                                     | 18 ++++
 debian/init                                        | 18 ++++
 debian/nodetool-completion                         | 17 ++++
 debian/rules                                       | 19 ++++-
 pylib/Dockerfile.ubuntu.py3                        | 16 ++++
 pylib/Dockerfile.ubuntu.py37                       | 11 +++
 pylib/Dockerfile.ubuntu.py38                       | 11 +++
 pylib/requirements.txt                             | 19 +++++
 redhat/cassandra                                   | 17 ++++
 redhat/cassandra.conf                              | 17 ++++
 redhat/default                                     | 17 ++++
 ...ssandra.io.sstable.format.SSTableFormat$Factory | 17 ++++
 .../cassandra/cql3/functions/JavaSourceUDF.txt     | 17 ++++
 test/conf/harry-generic.yaml                       | 17 ++++
 test/data/config/version=3.0.0-alpha1.yml          | 17 ++++
 test/data/config/version=3.11.0.yml                | 17 ++++
 test/data/config/version=4.0-alpha1.yml            | 17 ++++
 test/data/config/version=4.1-alpha1.yml            | 17 ++++
 test/data/config/version=5.0-alpha1.yml            | 17 ++++
 30 files changed, 531 insertions(+), 56 deletions(-)


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