From fb1594b17d81e8195c644dabecd7a7c847e18b40 Mon Sep 17 00:00:00 2001 From: Ed Sabol <22986767+esabol@users.noreply.github.com> Date: Sun, 5 Jul 2026 17:31:16 -0400 Subject: [PATCH] Update docs/manpage for --round-robin to document new default --- docs/source/gearmand.rst | 2 +- gearmand/gearmand.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/gearmand.rst b/docs/source/gearmand.rst index 8d38e6b87..365663ea0 100644 --- a/docs/source/gearmand.rst +++ b/docs/source/gearmand.rst @@ -57,7 +57,7 @@ SYNOPSIS .. option:: -R [ --round-robin ] - Assign work in round-robin order per worker connection. The default is to assign work in the order of functions added by the worker. + Assign work in round-robin order per worker connection. As of version 2.0.0, this is the default behavior, and it cannot be deactivated. This command line option does nothing, and its continued existence is only supported for backwards compatibility. .. option:: -q [ --queue-type ] arg diff --git a/gearmand/gearmand.cc b/gearmand/gearmand.cc index bb9a45bf9..617c03d52 100644 --- a/gearmand/gearmand.cc +++ b/gearmand/gearmand.cc @@ -179,7 +179,7 @@ int main(int argc, char *argv[]) "Load protocol module.") ("round-robin,R", boost::program_options::bool_switch(&opt_round_robin)->default_value(true), - "Assign work in round-robin order per worker connection. This is the default behavior, and it cannot be deactivated. This option is only provided for backwards compatibility.") + "Assign work in round-robin order per worker connection. This is the default behavior, and it cannot be deactivated. This command line option does nothing and is only supported for backwards compatibility.") ("queue-type,q", boost::program_options::value(&queue_type)->default_value("builtin"), "Persistent queue type to use.")