The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/6918
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) ===
From c57b7e011c256143a631dddbf0207e6623141b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Fri, 21 Feb 2020 19:46:42 -0500
Subject: [PATCH 1/2] doc: Fix escaping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
doc/api-extensions.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/api-extensions.md b/doc/api-extensions.md
index df2a62f160..5d9fd59a8a 100644
--- a/doc/api-extensions.md
+++ b/doc/api-extensions.md
@@ -915,7 +915,7 @@ This allows it to inherit some of the network's settings
and allows better valid
## clustering\_sizing
Support specifying a custom values for database voters and standbys.
-The new cluster.max_voters and cluster.max_standby configuration keys were
introduced
+The new cluster.max\_voters and cluster.max\_standby configuration keys were
introduced
to specify to the ideal number of database voter and standbys.
## firewall\_driver
From d473b85b475f2f6785eeec2a38348e5d894c1bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Fri, 21 Feb 2020 19:47:05 -0500
Subject: [PATCH 2/2] shared/api: Fix ServerEnvironment ordering
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
shared/api/server.go | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/shared/api/server.go b/shared/api/server.go
index 2424f24764..70f844a049 100644
--- a/shared/api/server.go
+++ b/shared/api/server.go
@@ -8,8 +8,12 @@ type ServerEnvironment struct {
CertificateFingerprint string `json:"certificate_fingerprint"
yaml:"certificate_fingerprint"`
Driver string `json:"driver" yaml:"driver"`
DriverVersion string `json:"driver_version"
yaml:"driver_version"`
- Kernel string `json:"kernel" yaml:"kernel"`
- KernelArchitecture string `json:"kernel_architecture"
yaml:"kernel_architecture"`
+
+ // API extension: firewall_driver
+ Firewall string `json:"firewall" yaml:"firewall"`
+
+ Kernel string `json:"kernel" yaml:"kernel"`
+ KernelArchitecture string `json:"kernel_architecture"
yaml:"kernel_architecture"`
// API extension: kernel_features
KernelFeatures map[string]string `json:"kernel_features"
yaml:"kernel_features"`
@@ -32,7 +36,6 @@ type ServerEnvironment struct {
ServerVersion string `json:"server_version" yaml:"server_version"`
Storage string `json:"storage" yaml:"storage"`
StorageVersion string `json:"storage_version" yaml:"storage_version"`
- Firewall string `json:"firewall" yaml:"firewall"`
}
// ServerPut represents the modifiable fields of a LXD server configuration
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
