[lxc-devel] [lxd/master] DO NOT MERGE

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200310/5f56751d/attachment.bin>
-------------- next part --------------
From 5a8de20bfd6280ca9f3df6e943d28c4f1288ebeb Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Wed, 11 Mar 2020 01:08:13 +0100
Subject: [PATCH] DO NOT MERGE

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 doc/api-extensions.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/api-extensions.md b/doc/api-extensions.md
index 4ae2accbe9..7c579507e8 100644
--- a/doc/api-extensions.md
+++ b/doc/api-extensions.md
@@ -949,3 +949,6 @@ This introduces the `ipv4.gateway` and `ipv6.gateway` NIC config keys that can t
 gateway being added inside the container and the same gateway address being added to the host-side interface.
 If the value is set to "none" then no default gateway nor will the address be added to the host-side interface.
 This allows multiple routed NIC devices to be added to a container.
+
+
+#### DO NOT MERGE