Commit Graph

2 Commits

Author SHA1 Message Date
bec84fb562 Merge branch 'master' into add-libcontainer
Conflicts:
	execdriver/termconsole.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ce08083f9cd23e8f5e44228b0b73884bcf2f3562
Component: engine
2014-02-26 12:55:24 -08:00
031e369945 Move the terminal setup to execdriver, instead of ./pkg/term
It is independent of any particular driver, but likely used by
  multiple execdrivers. Also, pkg/... is not to have any links to
  docker, which this terminal setup does.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: fabc478e7e33fd3b3c00c3bd74bad0d87a2c23e3
Component: engine
2014-02-24 15:28:45 -05:00