[lxc-devel] [lxd/master] Various fixes

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161231/0de17da5/attachment.bin>
-------------- next part --------------
From 8174055def2ca917b77332500ff360b2a10f62d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sat, 31 Dec 2016 19:08:09 +0100
Subject: [PATCH 1/2] api: Hide container restore field in yaml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 shared/api/container.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/api/container.go b/shared/api/container.go
index 9068c1d..7c25ee9 100644
--- a/shared/api/container.go
+++ b/shared/api/container.go
@@ -25,7 +25,7 @@ type ContainerPut struct {
 	Devices      map[string]map[string]string `json:"devices"`
 	Ephemeral    bool                         `json:"ephemeral"`
 	Profiles     []string                     `json:"profiles"`
-	Restore      string                       `json:"restore,omitempty"`
+	Restore      string                       `json:"restore,omitempty" yaml:"restore,omitempty"`
 }
 
 // Container represents a LXD container

From 3b9491abeefe5f60ca5f4cd202d4a3c2a4207901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sat, 31 Dec 2016 19:12:07 +0100
Subject: [PATCH 2/2] Update README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - Update CI layout a bit
 - Add weblate

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index bc1dde6..0bb68be 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,12 @@ LXD is pronounced lex-dee.
 
 To easily see what LXD is about, you can [try it online](https://linuxcontainers.org/lxd/try-it).
 
-## CI status
+## Status
 
- * Travis: [![Build Status](https://travis-ci.org/lxc/lxd.svg?branch=master)](https://travis-ci.org/lxc/lxd)
- * AppVeyor: [![Build Status](https://ci.appveyor.com/api/projects/status/rb4141dsi2xm3n0x/branch/master?svg=true)](https://ci.appveyor.com/project/lxc/lxd)
- * Jenkins: [![Build Status](https://jenkins.linuxcontainers.org/job/lxd-github-commit/badge/icon)](https://jenkins.linuxcontainers.org/job/lxd-github-commit/)
+ * Jenkins (Linux): [![Build Status](https://jenkins.linuxcontainers.org/job/lxd-github-commit/badge/icon)](https://jenkins.linuxcontainers.org/job/lxd-github-commit/)
+ * Travis (macOS): [![Build Status](https://travis-ci.org/lxc/lxd.svg?branch=master)](https://travis-ci.org/lxc/lxd/)
+ * AppVeyor (Windows): [![Build Status](https://ci.appveyor.com/api/projects/status/rb4141dsi2xm3n0x/branch/master?svg=true)](https://ci.appveyor.com/project/lxc/lxd/)
+ * Weblate (translations): [![Translation status](https://hosted.weblate.org/widgets/linux-containers/-/svg-badge.svg)](https://hosted.weblate.org/projects/linux-containers/lxd/)
 
 ## Getting started with LXD