Rohit Jnagal
|
eb9c9cabcb
|
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)
|
2014-04-28 23:04:04 +00:00 |
|
Rohit Jnagal
|
70b560a66d
|
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)
|
2014-04-25 06:02:30 +00:00 |
|
Rohit Jnagal
|
a20f60c5f9
|
Fix container.json sample to be loadable by nsinit.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
|
2014-04-25 00:17:45 +00:00 |