This is an automated email from the ASF dual-hosted git repository.
abh1sar pushed a change to branch nas-backport
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from f03ad74d015 Fix test failure in NasBackupProviderTest
add 5dcb8abaf34 Fix checkRoleEscalation performance and bugs in access
checking (#12973)
add 2511b24705d Merge branch '4.22' into nas-backport
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/cloudstack/acl/APIChecker.java | 28 +++++
.../acl/DynamicRoleBasedAPIAccessChecker.java | 36 +++++-
.../acl/DynamicRoleBasedAPIAccessCheckerTest.java | 132 +++++++++++++++++++++
.../acl/ProjectRoleBasedApiAccessChecker.java | 5 +
.../acl/StaticRoleBasedAPIAccessChecker.java | 16 +++
.../contrail/management/MockAccountManager.java | 5 +
.../main/java/com/cloud/user/AccountManager.java | 3 +
.../java/com/cloud/user/AccountManagerImpl.java | 75 +++++++-----
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 3 +
.../com/cloud/user/AccountManagerImplTest.java | 118 ++++++++++++++++++
10 files changed, 393 insertions(+), 28 deletions(-)
