]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 927f9ca)
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)
* static:
  static-update-component planet
  static-update-component wrapper

Conflicts:
modules/roles/manifests/static_source.pp


No differences found
Unnamed repository; edit this file 'description' to name the repository.