This is an automated email from the ASF dual-hosted git repository.
ddanielr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 95a6ca23ad6fc136062676d0cf15721ee2cfcd14
Merge: 9ec22b4b03 e4e8613e6d
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Sun Jul 28 23:50:37 2024 +0000
Merge branch '2.1'
assemble/bin/accumulo-service | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --cc assemble/bin/accumulo-service
index 9da187135d,390728fddc..c8258257ca
--- a/assemble/bin/accumulo-service
+++ b/assemble/bin/accumulo-service
@@@ -199,9 -200,14 +199,9 @@@ function main()
local service_type="$1"
local command_name="$2"
shift 2
- local service_name="unknown"
+ local service_name=$service_type
local all_flag=false
- if [[ $service_type == "master" ]]; then
- echo "WARN : Use of 'master' service name is deprecated; use 'manager'
instead."
- service_type="manager"
- fi
-
# Check and see if accumulo-cluster is calling this script
if [[ -z $ACCUMULO_SERVICE_INSTANCE ]]; then
# The rest of the arguments are from a user
@@@ -209,7 -215,9 +209,9 @@@
all_flag=true
else
# A named service has been specified
- service_name="$1"
- if [[ $1 != "-a" ]]; then
++ if [[ $1 != "-o" ]]; then
+ service_name="$1"
+ fi
fi
# Use the special bash env var from accumulo-cluster
else
