[lxc-devel] [lxd/master] Rebase of issue 1685

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 314 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160302/1cffe03d/attachment.bin>
-------------- next part --------------
From d6c7c793686fd5b53f2d851738a091bd75d85ca4 Mon Sep 17 00:00:00 2001
From: Janne Savikko <janne.savikko at aalto.fi>
Date: Tue, 1 Mar 2016 13:43:36 +0200
Subject: [PATCH 1/2] Add missing column type S(snapshots) in "lxc list --help"
 column listing

Signed-off-by: Janne Savikko <janne.savikko at aalto.fi>
---
 lxc/list.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lxc/list.go b/lxc/list.go
index dfa85df..bb831d6 100644
--- a/lxc/list.go
+++ b/lxc/list.go
@@ -79,6 +79,7 @@ The columns are:
 * p - pid of container init process
 * P - profiles
 * s - state
+* S - number of snapshots
 * t - type (persistent or ephemeral)
 
 Default column layout: ns46tS

From 860e50be976a0192c43a6bb546d79a82232aadcf Mon Sep 17 00:00:00 2001
From: Janne Savikko <janne.savikko at aalto.fi>
Date: Wed, 2 Mar 2016 10:22:17 +0200
Subject: [PATCH 2/2] update lxd.pot after list.go update

Signed-off-by: Janne Savikko <janne.savikko at aalto.fi>
---
 po/lxd.pot | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/po/lxd.pot b/po/lxd.pot
index 086a0bb..82b5cf0 100644
--- a/po/lxd.pot
+++ b/po/lxd.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: lxd\n"
         "Report-Msgid-Bugs-To: lxc-devel at lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2016-03-02 14:02-0700\n"
+        "POT-Creation-Date: 2016-03-02 16:46-0500\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
         "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -86,7 +86,7 @@ msgstr  ""
 msgid   "ARCH"
 msgstr  ""
 
-#: lxc/list.go:334
+#: lxc/list.go:335
 msgid   "ARCHITECTURE"
 msgstr  ""
 
@@ -120,7 +120,7 @@ msgstr  ""
 msgid   "COMMON NAME"
 msgstr  ""
 
-#: lxc/list.go:335
+#: lxc/list.go:336
 msgid   "CREATED AT"
 msgstr  ""
 
@@ -154,7 +154,7 @@ msgstr  ""
 msgid   "Client certificate stored at server: "
 msgstr  ""
 
-#: lxc/list.go:89 lxc/list.go:90
+#: lxc/list.go:90 lxc/list.go:91
 msgid   "Columns"
 msgstr  ""
 
@@ -256,7 +256,7 @@ msgstr  ""
 msgid   "Device %s removed from %s"
 msgstr  ""
 
-#: lxc/list.go:418
+#: lxc/list.go:419
 msgid   "EPHEMERAL"
 msgstr  ""
 
@@ -305,7 +305,7 @@ msgstr  ""
 msgid   "FINGERPRINT"
 msgstr  ""
 
-#: lxc/list.go:91
+#: lxc/list.go:92
 msgid   "Fast mode (same as --columns=nsacPt"
 msgstr  ""
 
@@ -340,11 +340,11 @@ msgstr  ""
 msgid   "Generating a client certificate. This may take a minute..."
 msgstr  ""
 
-#: lxc/list.go:332
+#: lxc/list.go:333
 msgid   "IPV4"
 msgstr  ""
 
-#: lxc/list.go:333
+#: lxc/list.go:334
 msgid   "IPV6"
 msgstr  ""
 
@@ -453,6 +453,7 @@ msgid   "Lists the available resources.\n"
         "* p - pid of container init process\n"
         "* P - profiles\n"
         "* s - state\n"
+        "* S - number of snapshots\n"
         "* t - type (persistent or ephemeral)\n"
         "\n"
         "Default column layout: ns46tS\n"
@@ -654,7 +655,7 @@ msgstr  ""
 msgid   "Must supply container name for: "
 msgstr  ""
 
-#: lxc/list.go:336 lxc/remote.go:312
+#: lxc/list.go:337 lxc/remote.go:312
 msgid   "NAME"
 msgstr  ""
 
@@ -696,15 +697,15 @@ msgstr  ""
 msgid   "Override the terminal mode (auto, interactive or non-interactive)"
 msgstr  ""
 
-#: lxc/list.go:420
+#: lxc/list.go:421
 msgid   "PERSISTENT"
 msgstr  ""
 
-#: lxc/list.go:337
+#: lxc/list.go:338
 msgid   "PID"
 msgstr  ""
 
-#: lxc/list.go:338
+#: lxc/list.go:339
 msgid   "PROFILES"
 msgstr  ""
 
@@ -835,11 +836,11 @@ msgstr  ""
 msgid   "SIZE"
 msgstr  ""
 
-#: lxc/list.go:339
+#: lxc/list.go:340
 msgid   "SNAPSHOTS"
 msgstr  ""
 
-#: lxc/list.go:340
+#: lxc/list.go:341
 msgid   "STATE"
 msgstr  ""
 
@@ -919,7 +920,7 @@ msgstr  ""
 msgid   "Store the container state (only for stop)."
 msgstr  ""
 
-#: lxc/list.go:341
+#: lxc/list.go:342
 msgid   "TYPE"
 msgstr  ""