The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/2415
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 a550cb4d29665e76558ecd12c13a5f34f2d55cd7 Mon Sep 17 00:00:00 2001 From: jpic <james...@gmail.com> Date: Sat, 17 Sep 2016 14:48:49 +0200 Subject: [PATCH 1/2] Document lxc exec -- args Signed-off-by: James Pic <j...@yourlabs.org> --- lxc/exec.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc/exec.go b/lxc/exec.go index ba3e5e0..f68bb0a 100644 --- a/lxc/exec.go +++ b/lxc/exec.go @@ -45,7 +45,7 @@ func (c *execCmd) usage() string { return i18n.G( `Execute the specified command in a container. -lxc exec [remote:]container [--mode=auto|interactive|non-interactive] [--env EDITOR=/usr/bin/vim]... <command> +lxc exec [remote:]container [--mode=auto|interactive|non-interactive] [--env EDITOR=/usr/bin/vim]... [--] <command line> Mode defaults to non-interactive, interactive mode is selected if both stdin AND stdout are terminals (stderr is ignored).`) } From 2aa44d7af4157e60acc4726dea27ab6310e0587e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com> Date: Thu, 22 Sep 2016 01:40:24 -0400 Subject: [PATCH 2/2] i18n: Update for previous commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #2392 Signed-off-by: Stéphane Graber <stgra...@ubuntu.com> --- po/lxd.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/lxd.pot b/po/lxd.pot index c2c6bb5..abf09b0 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@lists.linuxcontainers.org\n" - "POT-Creation-Date: 2016-09-19 18:00+0200\n" + "POT-Creation-Date: 2016-09-22 01:40-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -328,7 +328,7 @@ msgstr "" #: lxc/exec.go:45 msgid "Execute the specified command in a container.\n" "\n" - "lxc exec [remote:]container [--mode=auto|interactive|non-interactive] [--env EDITOR=/usr/bin/vim]... <command>\n" + "lxc exec [remote:]container [--mode=auto|interactive|non-interactive] [--env EDITOR=/usr/bin/vim]... [--] <command line>\n" "\n" "Mode defaults to non-interactive, interactive mode is selected if both stdin AND stdout are terminals (stderr is ignored)." msgstr "" @@ -1151,7 +1151,7 @@ msgstr "" msgid "Transferring image: %d%%" msgstr "" -#: lxc/action.go:99 lxc/launch.go:132 +#: lxc/action.go:99 lxc/launch.go:137 #, c-format msgid "Try `lxc info --show-log %s` for more info" msgstr ""
_______________________________________________ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel