summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/rabbitmq-server2
-rw-r--r--scripts/rabbitmq-server.bat2
-rw-r--r--scripts/rabbitmq-service.bat2
-rw-r--r--src/rabbit_channel.erl2
-rw-r--r--test/dead_lettering_SUITE.erl2
5 files changed, 5 insertions, 5 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 67231fddb4..b4863057f0 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -219,7 +219,7 @@ fi
# The defaults are meant to reduce RabbitMQ's memory usage and help
# it reclaim memory at the cost of a slight decrease in performance
# (due to an increase in memory operations). These defaults can be
-# overriden using the RABBITMQ_SERVER_ERL_ARGS variable.
+# overridden using the RABBITMQ_SERVER_ERL_ARGS variable.
RABBITMQ_DEFAULT_ALLOC_ARGS="+MBas ageffcbf +MHas ageffcbf +MBlmbcs 512 +MHlmbcs 512 +MMmcs 30"
${ERL_DIR}erl ${RABBITMQ_DEFAULT_ALLOC_ARGS} \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index d417091732..462db4c10c 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -167,7 +167,7 @@ rem
rem The defaults are meant to reduce RabbitMQ's memory usage and help
rem it reclaim memory at the cost of a slight decrease in performance
rem (due to an increase in memory operations). These defaults can be
-rem overriden using the RABBITMQ_SERVER_ERL_ARGS variable.
+rem overridden using the RABBITMQ_SERVER_ERL_ARGS variable.
set RABBITMQ_DEFAULT_ALLOC_ARGS=+MBas ageffcbf +MHas ageffcbf +MBlmbcs 512 +MHlmbcs 512 +MMmcs 30
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 7bb1f124b5..e3057f16b5 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -254,7 +254,7 @@ rem
rem The defaults are meant to reduce RabbitMQ's memory usage and help
rem it reclaim memory at the cost of a slight decrease in performance
rem (due to an increase in memory operations). These defaults can be
-rem overriden using the RABBITMQ_SERVER_ERL_ARGS variable.
+rem overridden using the RABBITMQ_SERVER_ERL_ARGS variable.
set RABBITMQ_DEFAULT_ALLOC_ARGS=+MBas ageffcbf +MHas ageffcbf +MBlmbcs 512 +MHlmbcs 512 +MMmcs 30
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index ffd7c8fabc..b255e2cbce 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -1455,7 +1455,7 @@ handle_method(#'basic.qos'{prefetch_size = Size}, _, _State) when Size /= 0 ->
handle_method(#'basic.qos'{global = false,
prefetch_count = PrefetchCount},
_, State = #ch{limiter = Limiter}) ->
- %% Ensures that if default was set, it's overriden
+ %% Ensures that if default was set, it's overridden
Limiter1 = rabbit_limiter:unlimit_prefetch(Limiter),
{reply, #'basic.qos_ok'{}, State#ch{consumer_prefetch = PrefetchCount,
limiter = Limiter1}};
diff --git a/test/dead_lettering_SUITE.erl b/test/dead_lettering_SUITE.erl
index 72c72b096c..afba0d56e6 100644
--- a/test/dead_lettering_SUITE.erl
+++ b/test/dead_lettering_SUITE.erl
@@ -741,7 +741,7 @@ dead_letter_override_policy(Config) ->
[_] = consume(Ch, DLXQName, [P1]).
%% 9) Policy is set after have declared a queue with dead letter arguments. Policy will be
-%% overriden/ignored.
+%% overridden/ignored.
dead_letter_ignore_policy(Config) ->
{_Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config, 0),
QName = ?config(queue_name, Config),