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 2022/02/07 12:09:34 UTC

[cassandra] branch cassandra-4.0 updated (371add4 -> 66d792a)

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

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


    from 371add4  Merge branch 'cassandra-3.11' into cassandra-4.0
     new 5c9ba06  Extend operator control over the UDF threading model
     new b022aec  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 66d792a  Merge branch 'cassandra-3.11' into cassandra-4.0

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:
 src/java/org/apache/cassandra/config/Config.java      | 13 +++++++++++++
 .../apache/cassandra/config/DatabaseDescriptor.java   | 16 ++++++++++++++++
 .../apache/cassandra/cql3/functions/UDFunction.java   | 19 ++++++++++++++++++-
 .../security/ThreadAwareSecurityManager.java          |  5 +++++
 4 files changed, 52 insertions(+), 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.11' into cassandra-4.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-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 66d792adda3cca9b82d25bff3921a28957853d16
Merge: 371add4 b022aec
Author: Marcus Eriksson <ma...@apache.org>
AuthorDate: Mon Feb 7 13:00:38 2022 +0100

    Merge branch 'cassandra-3.11' into cassandra-4.0

 src/java/org/apache/cassandra/config/Config.java      | 13 +++++++++++++
 .../apache/cassandra/config/DatabaseDescriptor.java   | 16 ++++++++++++++++
 .../apache/cassandra/cql3/functions/UDFunction.java   | 19 ++++++++++++++++++-
 .../security/ThreadAwareSecurityManager.java          |  5 +++++
 4 files changed, 52 insertions(+), 1 deletion(-)

diff --cc src/java/org/apache/cassandra/security/ThreadAwareSecurityManager.java
index 86c8b5b,3d72559..3ff6820
--- a/src/java/org/apache/cassandra/security/ThreadAwareSecurityManager.java
+++ b/src/java/org/apache/cassandra/security/ThreadAwareSecurityManager.java
@@@ -66,13 -66,8 +67,14 @@@ public final class ThreadAwareSecurityM
      private static final RuntimePermission CHECK_MEMBER_ACCESS_PERMISSION = new RuntimePermission("accessDeclaredMembers");
      private static final RuntimePermission MODIFY_THREAD_PERMISSION = new RuntimePermission("modifyThread");
      private static final RuntimePermission MODIFY_THREADGROUP_PERMISSION = new RuntimePermission("modifyThreadGroup");
+     private static final RuntimePermission SET_SECURITY_MANAGER_PERMISSION = new RuntimePermission("setSecurityManager");
  
 +    // Nashorn / Java 11
 +    private static final RuntimePermission NASHORN_GLOBAL_PERMISSION = new RuntimePermission("nashorn.createGlobal");
 +    private static final ReflectPermission SUPPRESS_ACCESS_CHECKS_PERMISSION = new ReflectPermission("suppressAccessChecks");
 +    private static final RuntimePermission DYNALINK_LOOKUP_PERMISSION = new RuntimePermission("dynalink.getLookup");
 +    private static final RuntimePermission GET_CLASSLOADER_PERMISSION = new RuntimePermission("getClassLoader");
 +
      private static volatile boolean installed;
  
      public static void install()

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