Merge branch 'static'
authorPeter Palfrader <peter@palfrader.org>
Wed, 19 Dec 2012 21:38:15 +0000 (22:38 +0100)
committerPeter Palfrader <peter@palfrader.org>
Wed, 19 Dec 2012 21:38:15 +0000 (22:38 +0100)
commit927f9ca9bed8928ea91ba1a599857c483ae4994e
tree438e90f5a8e1b9f80c85c859ba4268a7e6ee8d90
parent158cfd6270c8fc11318fed73b521b04c2da77f8a
parent28358d5adb50006de89834330f4a31714bea5e5a
Merge branch 'static'

* static:
  static-update-component planet
  static-update-component wrapper

Conflicts:
modules/roles/manifests/static_source.pp
modules/roles/manifests/static_source.pp
modules/sudo/files/sudoers