[lxc-devel] [lxc/lxc] 5dc49b: Revert "lxc-cmd-stop: two fixes"

[GitHub]

  Branch: refs/heads/stable-1.1
  Home:   https://github.com/lxc/lxc
  Commit: 5dc49b290c12d445baf677c1fd2649da80d6953b
      https://github.com/lxc/lxc/commit/5dc49b290c12d445baf677c1fd2649da80d6953b
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M src/lxc/commands.c

  Log Message:
  -----------
  Revert "lxc-cmd-stop: two fixes"

This breaks code that depended on the monitor being fully dead before
c->stop() returns.

This reverts commit 62e041610609c8913c3d397a521716819a91f850.


  Commit: 17f48b9679b2bb6d4e5d156fa59e6399f82277d9
      https://github.com/lxc/lxc/commit/17f48b9679b2bb6d4e5d156fa59e6399f82277d9
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M src/lxc/Makefile.am
    M src/lxc/conf.c
    M src/lxc/conf.h
    M src/lxc/confile.c
    M src/lxc/log.c
    M src/lxc/log.h
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  Revert (by hand) "logs: introduce a thread-local 'current' lxc_config"

This is hopefully temporary - it works great for lxc itself, but seems
to be upsetting golang.

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Tested-by: Tycho Andersen <tycho.andersen at canonical.com>


Compare: https://github.com/lxc/lxc/compare/3149bd4c0e81...17f48b9679b2