Merge branch 'master' into networking

2013-02-28 11:52:52 -08:00 · 2013-02-28 11:52:52 -08:00 · f62344b750
--- a/puppet/modules/docker/manifests/init.pp
+++ b/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"],