You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2018/03/28 19:27:35 UTC
[3/3] qpid-dispatch git commit: Remove merge conflict msgs
Remove merge conflict msgs
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/90a6e78f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/90a6e78f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/90a6e78f
Branch: refs/heads/DISPATCH-938
Commit: 90a6e78fc8c6cff71bb6f46fb5c3782bb1c42ccb
Parents: 3a8596a
Author: Ben Hardesty <bh...@redhat.com>
Authored: Fri Mar 16 11:08:27 2018 -0400
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Wed Mar 28 15:27:21 2018 -0400
----------------------------------------------------------------------
doc/new-book/logging.adoc | 8 --------
doc/new-book/routing.adoc | 28 ----------------------------
2 files changed, 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/90a6e78f/doc/new-book/logging.adoc
----------------------------------------------------------------------
diff --git a/doc/new-book/logging.adoc b/doc/new-book/logging.adoc
index c548e99..2f929c9 100644
--- a/doc/new-book/logging.adoc
+++ b/doc/new-book/logging.adoc
@@ -291,11 +291,7 @@ To specify multiple levels, use a comma-separated list. You can also use `+` to
//end::logging-levels[]
`timestamp`:: Set this to `yes` to include the timestamp in all logs.
-<<<<<<< HEAD
-For information about additional log attributes, see xref:router-configuration-file-log[Log] in the _Configuration Reference_.
-=======
For information about additional log attributes, see link:{qdrouterdConfManPageUrl}#_log[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. Add an additional `log` section for each logging module that should not follow the default logging configuration:
@@ -316,11 +312,7 @@ log {
+
include::logging.adoc[tags=logging-levels]
-<<<<<<< HEAD
-For information about additional log attributes, see xref:router-configuration-file-log[Log] in the _Configuration Reference_.
-=======
For information about additional log attributes, see link:{qdrouterdConfManPageUrl}#_log[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
== Viewing Log Entries
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/90a6e78f/doc/new-book/routing.adoc
----------------------------------------------------------------------
diff --git a/doc/new-book/routing.adoc b/doc/new-book/routing.adoc
index aaa2373..e1e039a 100644
--- a/doc/new-book/routing.adoc
+++ b/doc/new-book/routing.adoc
@@ -248,11 +248,7 @@ You can convert a `prefix` value to a `pattern` by appending `/\#` to it. For ex
+
For more information about message distribution patterns, see xref:routing-patterns-overview[Routing Patterns].
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-address[Address] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_address[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. Add the same `address` section to any other routers that need to use the address.
@@ -350,11 +346,7 @@ connector {
`port`:: The port number or symbolic service name on which the router should connect to the broker.
`role`:: Specify `route-container` to indicate that this connection is for an external container (broker).
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-connector[Connector] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_connector[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. If you want to send messages to the broker queue, create an outgoing autolink to the broker queue:
@@ -375,11 +367,7 @@ autoLink {
`connection` | `containerID`:: How the router should connect to the broker. You can specify either an outgoing connection (`connection`) or the container ID of the broker (`containerID`).
`direction`:: Set this attribute to `out` to specify that this autolink can send messages from the router to the broker.
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-autolink[autoLink] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_autolink[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. If you want to receive messages from the broker queue, create an incoming autolink from the broker queue:
@@ -400,11 +388,7 @@ autoLink {
`connection` | `containerID`:: How the router should connect to the broker. You can specify either an outgoing connection (`connection`) or the container ID of the broker (`containerID`).
`direction`:: Set this attribute to `in` to specify that this autolink can receive messages from the broker to the router.
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-autolink[autoLink] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_autolink[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
=== Example: Routing Messages Through Broker Queues
@@ -588,11 +572,7 @@ connector {
`port`:: The port number or symbolic service name on which the router should connect to the broker.
`role`:: Specify `route-container` to indicate that this connection is for an external container (broker).
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-connector[Connector] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_connector[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. If you want clients to send messages on this link route, create an incoming link route:
@@ -620,11 +600,7 @@ If multiple brokers are connected to the router through this connection, request
`direction`:: Set this attribute to `in` to specify that clients can send messages into the router network on this link route.
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-linkroute[linkRoute] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_linkroute[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. If you want clients to receive messages on this link route, create an outgoing link route:
@@ -651,11 +627,7 @@ include::routing.adoc[tags=pattern-matching]
If multiple brokers are connected to the router through this connection, requests for addresses matching the link route's prefix or pattern are balanced across the brokers. Alternatively, if you want to specify a particular broker, use `containerID` and add the broker's container ID.
`direction`:: Set this attribute to `out` to specify that this link route is for receivers.
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-linkroute[linkRoute] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_linkroute[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
=== Example: Using a Link Route to Provide Client Isolation
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org