[lxc-devel] [lxc/lxc] 2da1f5: lxc-autostart: don't set timeout if user requested...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 2da1f56ce304ad8dbd651d1305de9b6d58dd19db
      https://github.com/lxc/lxc/commit/2da1f56ce304ad8dbd651d1305de9b6d58dd19db
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2013-12-24 (Tue, 24 Dec 2013)

  Changed paths:
    M doc/ja/lxc-autostart.sgml.in
    M doc/lxc-autostart.sgml.in
    M src/lxc/lxc_autostart.c

  Log Message:
  -----------
  lxc-autostart: don't set timeout if user requested -s

same as the commit 25070b660187b61aa4e969db01b55d1360639543

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>