The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/6664
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Closes #6653
Suggested-by: Marcos Dione
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
From 929f74c774bf8daa355068d2939931e9ee232cd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Wed, 1 Jan 2020 06:05:09 -0500
Subject: [PATCH] doc/networks: Clarify raw.dnsmasq
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #6653
Suggested-by: Marcos Dione
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
doc/networks.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/networks.md b/doc/networks.md
index 4f18dced1b..51143a42d5 100644
--- a/doc/networks.md
+++ b/doc/networks.md
@@ -85,7 +85,7 @@ ipv6.nat.order | string | ipv6 address
| before
ipv6.nat.address | string | ipv6 address | -
| The source address used for outbound traffic from the bridge
ipv6.routes | string | ipv6 address | -
| Comma separated list of additional IPv6 CIDR subnets to
route to the bridge
ipv6.routing | boolean | ipv6 address | true
| Whether to route traffic in and out of the bridge
-raw.dnsmasq | string | - | -
| Additional dnsmasq configuration to append to the
configuration
+raw.dnsmasq | string | - | -
| Additional dnsmasq configuration to append to the
configuration file
tunnel.NAME.group | string | vxlan |
239.0.0.1 | Multicast address for vxlan (used if local and
remote aren't set)
tunnel.NAME.id | integer | vxlan | 0
| Specific tunnel ID to use for the vxlan tunnel
tunnel.NAME.interface | string | vxlan | -
| Specific host interface to use for the tunnel
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
