 Michael Crosby
|
ce08083f9c
|
Merge branch 'master' into add-libcontainer
Conflicts:
execdriver/termconsole.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
|
2014-02-26 12:55:24 -08:00 |
|
|
Michael Crosby
|
8db740a38e
|
Move types around in native driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
|
2014-02-24 21:21:35 -08:00 |
|
|
Michael Crosby
|
d59c05a37c
|
Fix exec driver flag, rename new driver to 'native'
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
|
2014-02-24 20:41:09 -08:00 |
|