You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2023/10/27 17:36:15 UTC
(ranger) 03/03: Merge branch 'master' into RANGER-3923
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 7ff8740db806dc1fd4abac9c69625a98e5a7789e
Merge: d600682b6 7a22b82a5
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Fri Oct 27 09:59:18 2023 -0700
Merge branch 'master' into RANGER-3923
dev-support/ranger-docker/.env | 17 +-
dev-support/ranger-docker/Dockerfile.ranger-hadoop | 23 +-
dev-support/ranger-docker/Dockerfile.ranger-hbase | 14 +-
dev-support/ranger-docker/Dockerfile.ranger-hive | 18 +-
dev-support/ranger-docker/Dockerfile.ranger-kafka | 14 +-
dev-support/ranger-docker/Dockerfile.ranger-kms | 10 +-
dev-support/ranger-docker/Dockerfile.ranger-knox | 14 +-
.../ranger-docker/Dockerfile.ranger-tagsync | 16 +-
.../ranger-docker/Dockerfile.ranger-usersync | 12 +-
.../ranger-docker/docker-compose.ranger-hadoop.yml | 6 +-
.../ranger-docker/docker-compose.ranger-hbase.yml | 4 +-
.../ranger-docker/docker-compose.ranger-hive.yml | 4 +-
.../ranger-docker/docker-compose.ranger-kafka.yml | 4 +-
.../ranger-docker/docker-compose.ranger-kms.yml | 4 +-
.../ranger-docker/docker-compose.ranger-knox.yml | 4 +-
.../docker-compose.ranger-tagsync.yml | 4 +-
.../docker-compose.ranger-usersync.yml | 4 +-
security-admin/pom.xml | 1086 ++++++++------------
.../webapp/{index.html => backbone-index.html} | 0
.../main/webapp/react-webapp/src/views/Header.jsx | 11 +-
.../react-webapp/src/views/SideBar/SideBarBody.jsx | 14 +-
.../main/webapp/scripts/views/common/ProfileBar.js | 3 +-
.../webapp/templates/common/ProfileBar_tmpl.html | 5 +-
23 files changed, 534 insertions(+), 757 deletions(-)
diff --cc security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBarBody.jsx
index 88c4080b7,ce4300ac5..0bcccc968
mode 100755,100644..100755
--- a/security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBarBody.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBarBody.jsx