Merge pull request #61899 from rhcs-dashboard/disable-deleting-bucket-with-objects

author Aashish Sharma <66050535+aaSharma14@users.noreply.github.com>

Mon, 24 Feb 2025 06:19:17 +0000 (11:49 +0530)

committer GitHub <noreply@github.com>

Mon, 24 Feb 2025 06:19:17 +0000 (11:49 +0530)
author Aashish Sharma <66050535+aaSharma14@users.noreply.github.com>
Mon, 24 Feb 2025 06:19:17 +0000 (11:49 +0530)
committer GitHub <noreply@github.com>
Mon, 24 Feb 2025 06:19:17 +0000 (11:49 +0530)
diff --cc src/pybind/mgr/dashboard/controllers/rgw.py
Simple merge
diff --cc src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts
Simple merge
diff --cc src/pybind/mgr/dashboard/openapi.yaml

index 396efb70a7921d907c0bf42fa2f65e6cd328e24e,b5d5e16172134a1076a4b888152b71e0726c4608..68cc8c243ae51583c8fe9b8e8f540e431fdaed5b

mode 100755,100644..100755
--- 1/src/pybind/mgr/dashboard/openapi.yaml
--- 2/src/pybind/mgr/dashboard/openapi.yaml
+++ b/src/pybind/mgr/dashboard/openapi.yaml
author	Aashish Sharma <66050535+aaSharma14@users.noreply.github.com>
	Mon, 24 Feb 2025 06:19:17 +0000 (11:49 +0530)
committer	GitHub <noreply@github.com>
	Mon, 24 Feb 2025 06:19:17 +0000 (11:49 +0530)
		1	2
src/pybind/mgr/dashboard/controllers/rgw.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/openapi.yaml	patch \|	diff1 \|	diff2 \|	blob \| history