|
|
7fb7f768a7
|
Merge branch 'master' into libcontainer-fixes
Conflicts:
pkg/libcontainer/README.md
pkg/libcontainer/container.json
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: c44c51e3ce1680ec2a74fc62f246490f61d7590c
Component: engine
|
2014-04-28 23:04:04 +00:00 |
|
|
|
ecc3df07ca
|
Updated sample config and README to match the default template for
native execdriver.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: 24f978094dc5c9eae0ca60001b65256b2b30f2c8
Component: engine
|
2014-04-25 06:02:30 +00:00 |
|
|
|
df00ac1430
|
Fix container.json sample to be loadable by nsinit.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: 14b2a9de874ab80aaaa942b7b8a226bb56dfcd7f
Component: engine
|
2014-04-25 00:17:45 +00:00 |
|
