ARTEMIS-1694 fix graceful-shutdown doc
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/03709fc7 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/03709fc7 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/03709fc7 Branch: refs/heads/master Commit: 03709fc7cfa8fc1c1f78940adc0a420792a7eecf Parents: fb62fe9 Author: Justin Bertram <jbert...@apache.org> Authored: Thu Feb 22 09:05:14 2018 -0600 Committer: Michael Andre Pearce <michael.andre.pea...@me.com> Committed: Mon Feb 26 19:14:44 2018 +0000 ---------------------------------------------------------------------- .../org/apache/activemq/artemis/core/config/Configuration.java | 2 +- docs/user-manual/en/configuration-index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03709fc7/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java index 27cdba2..5d9c2eb 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java @@ -211,7 +211,7 @@ public interface Configuration { /** * Returns whether graceful shutdown is enabled for this server. <br> - * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}. + * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_GRACEFUL_SHUTDOWN_ENABLED}. */ boolean isGracefulShutdownEnabled(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03709fc7/docs/user-manual/en/configuration-index.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/configuration-index.md b/docs/user-manual/en/configuration-index.md index f962d21..13112de 100644 --- a/docs/user-manual/en/configuration-index.md +++ b/docs/user-manual/en/configuration-index.md @@ -62,7 +62,7 @@ Name | Description [disk-scan-period](paging.md#max-disk-usage) | The interval where the disk is scanned for percentual usage. Default=5000 ms. [diverts](diverts.md "Diverting and Splitting Message Flows") | [a list of diverts to use](#divert-type) [global-max-size](paging.md#global-max-size) | The amount in bytes before all addresses are considered full. Default is half of the memory used by the JVM (-Xmx argument). -[graceful-shutdown-enabled](graceful-shutdown.md "Graceful Server Shutdown") | true means that graceful shutdown is enabled. Default=true +[graceful-shutdown-enabled](graceful-shutdown.md "Graceful Server Shutdown") | true means that graceful shutdown is enabled. Default=false [graceful-shutdown-timeout](graceful-shutdown.md "Graceful Server Shutdown") | Timeout on waiting for clients to disconnect before server shutdown. Default=-1 [grouping-handler](message-grouping.md "Message Grouping") | Message Group configuration [id-cache-size](duplicate-detection.md "Configuring the Duplicate ID Cache") | The duplicate detection circular cache size. Default=20000
