Merge branch 'master' into networking

Upstream-commit: f62344b75053fbfaf66246c2cb3e20577e317ce4 Component: engine
2013-02-28 11:52:52 -08:00
parent db9b80be91 58a8b7bd53
commit 7bb4e569d5
1 changed files with 1 additions and 1 deletions
--- a/components/engine/puppet/modules/docker/manifests/init.pp
+++ b/components/engine/puppet/modules/docker/manifests/init.pp
@ -8,7 +8,7 @@ class docker {

    Package { ensure => "installed" }

-    package { ["lxc", "debootstrap", "wget"]: }
+    package { ["lxc", "debootstrap", "wget", "bsdtar"]: }

    exec { "debootstrap" :
        require => Package["debootstrap"],